Skip to content
Commit 088beb48 authored by Ján Homola's avatar Ján Homola
Browse files

Merge remote-tracking branch 'origin/xhusarc-game-scheduler' 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/service/MatchService.java
parents 0ddff34b d5d4fc8c
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