Merge branch 'master' into xhomola-league-table
# Conflicts: # core/src/main/java/cz/muni/fi/pa165/core/controller/MatchController.java # core/src/main/java/cz/muni/fi/pa165/core/repository/MatchRepository.java # core/src/main/java/cz/muni/fi/pa165/core/service/MatchService.java # core/src/main/resources/data.sql
Please register or sign in to comment