Skip to content
Commit 6ec0c848 authored by Jakub Šušlík's avatar Jakub Šušlík
Browse files

Merge branch 'milestone-4' into 'song-create-fix' 

# Conflicts:
#   module-core/db_utils/scripts/seed.sql
#   module-core/src/main/java/cz/muni/fi/pa165/modulecore/data/model/Song.java
parents 9a8327c4 34250933
Pipeline #240549 passed with stages
in 2 minutes and 45 seconds
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