-
Matija Obreza authored
Conflicts: pom.xml src/main/java/org/genesys2/server/service/UserService.java src/main/java/org/genesys2/server/service/impl/UserServiceImpl.java src/main/java/org/genesys2/server/servlet/controller/UserProfileController.java src/main/resources/spring/spring.properties src/main/webapp/WEB-INF/jsp/user/profile.jsp
4ea27d63