Skip to content
Commit 2f4282e3 authored by MichalGomeDev's avatar MichalGomeDev
Browse files

Merge branch 'master' of... 

Merge branch 'master' of https://gitlab.fi.muni.cz/xlestin1/pa165_ice-hockey-manager into after_M1_changes#2

# Conflicts:
#	pom.xml
parents 8d3fd917 0f02c357
Hide whitespace changes
Inline Side-by-side
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