Skip to content
Commit 4587b072 authored by offifi's avatar offifi
Browse files

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
parents ee6a8d2b 5bfe5468
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