Skip to content
Commit ce4515fe authored by Zuzana Tunegová's avatar Zuzana Tunegová
Browse files

Merge branch 'milestone-2' into 'milestone-2-service-tests'

# Conflicts:
#   mbm-service/src/main/java/cz/fi/muni/pa165/MusicianServiceImpl.java
parents 95d1179e 454a2d39
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