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

Merge remote-tracking branch 'origin/jpa' into certificate-service

# Conflicts:
#	core/src/main/java/cz/muni/fi/core/data/repository/ExerciseRepository.java
#	core/src/main/java/cz/muni/fi/core/data/repository/LectureRepository.java
#	core/src/test/java/cz/muni/fi/core/facade/LectureFacadeTest.java
parents 6eb4afe9 59d30848
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment