Skip to content
Commit 85bac561 authored by Ján Homola's avatar Ján Homola
Browse files

Merge branch 'xhusarc-game-scheduler' into xhomola-league-table

# Conflicts:
#	model/src/main/java/cz/muni/fi/pa165/model/dto/TeamDto.java
parents 7748d2b3 26c72934
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