Skip to content
Snippets Groups Projects
Commit 276a790a authored by Dominika Zemanovičová's avatar Dominika Zemanovičová
Browse files

Merge branch 'M2-exercise' into M2

# Conflicts:
#	application/model/src/main/java/org/fuseri/model/dto/course/CourseDto.java
#	application/model/src/main/java/org/fuseri/model/dto/lecture/LectureDto.java
#	application/model/src/main/java/org/fuseri/model/dto/user/UserDto.java
#	application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateControllerTests.java
#	application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/course/CourseControllerTest.java
#	application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/user/UserControllerTest.java
parents dbbbdd52 706cf4c0
No related branches found
No related tags found
2 merge requests!31M2,!30M2 exercise
Pipeline #
Showing
with 149 additions and 263 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment