Skip to content
Commit 24bd3fcb authored by Marek Skácelík's avatar Marek Skácelík
Browse files

Merge branch 'milestone-3' into 'feature/seeder' 

# Conflicts:
#   core/src/main/java/cz/muni/fi/pa165/core/DataInitializer.java
#   core/src/main/java/cz/muni/fi/pa165/core/user/roles/Role.java
parents 40866e0e b12c047e
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