Skip to content
Commit 84fa7abb authored by xpecuch3's avatar xpecuch3
Browse files

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	service/src/test/java/cz/muni/fi/pa165/facade/TestMissionFacadeImpl.java
#	service/src/test/java/cz/muni/fi/pa165/service/TestMissionServiceImpl.java
parents 671ebe05 529083e9
Pipeline #94094 passed with stage
in 1 minute and 1 second
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