Skip to content
Commit ce4e6fe1 authored by Alexandra Skyslakova's avatar Alexandra Skyslakova
Browse files

Merge branch 'milestone-02' into IT-tests-core 

# Conflicts:
#	core/src/main/java/cz/muni/fi/core/service/CourseEnrollmentService.java
parents 86272f80 a7b02eea
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