Skip to content
Commit 90314674 authored by Patrik Čangel's avatar Patrik Čangel
Browse files

Merge branch 'milestone-4' of gitlab.fi.muni.cz:xvalent/youband-manager into milestone-4 

# Conflicts:
#	locust/locustfile.py
parents 8ca80e8d 4b8ad831
Pipeline #240569 passed with stages
in 2 minutes and 37 seconds
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment