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

Merge remote-tracking branch 'origin/M2-user' into M2

# Conflicts:
#	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-certificate/src/test/java/org/fuseri/modulecertificate/CertificateFacadeTests.java
#	application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateMapperTests.java
#	application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateServiceTests.java
#	application/module-exercise/src/main/java/org/fuseri/moduleexercise/exercise/ExerciseFacade.java
#	application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/user/UserControllerTest.java
parents 42013ed6 ba4bb13c
No related branches found
No related tags found
Loading
Showing
with 170 additions and 92 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