Skip to content
Commit 1e8b1516 authored by s__mis's avatar s__mis
Browse files

Merge remote-tracking branch 'origin/userServiceFinalFix' into userServiceFinalFix 

# Conflicts:
#	user/src/test/java/cz/muni/fi/pa165/controller/UserControllerTest.java
#	user/src/test/java/cz/muni/fi/pa165/facade/UserFacadeTest.java
#	user/src/test/java/cz/muni/fi/pa165/service/UserServiceTest.java
parents dbe82536 9b9f3441
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