Skip to content
Commit 0489f132 authored by Daniel Pecuch's avatar Daniel Pecuch
Browse files

Merge branch 'master' into 'fixed_variables_naming_in_tests' 

# Conflicts:
#   service/src/test/java/cz/muni/fi/pa165/facade/TestMissionFacadeImpl.java
#   service/src/test/java/cz/muni/fi/pa165/service/TestMissionServiceImpl.java
parents 401c6228 529083e9
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