Merge branch 'master' of https://gitlab.fi.muni.cz/xlestin1/pa165_ice-hockey-manager
# Conflicts: # match/src/main/java/cz/muni/fi/pa165/facade/MatchFacade.java
Please register or sign in to comment
# Conflicts: # match/src/main/java/cz/muni/fi/pa165/facade/MatchFacade.java