Skip to content

Commit

Permalink
Merge branch 'sportEventTest'
Browse files Browse the repository at this point in the history 
# Conflicts:
#	persistence/src/main/java/cz/fi/muni/pa165/entity/SportEvent.java
  • Loading branch information
@jiritobias
jiritobias committed Oct 29, 2017
2 parents 092ae42 + ab536da commit 4c82071
Show file tree
Hide file tree
Showing 2 changed files with 349 additions and 145 deletions.
Loading

0 comments on commit 4c82071

Please sign in to comment.