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

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

# Conflicts:
#	core/src/test/java/cz/muni/fi/core/service/LectureServiceTest.java
parents f802fbe2 c55336a9
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment