• Matija Obreza's avatar
    Merge branch 'master' into staging · ba71db05
    Matija Obreza authored
    # Conflicts:
    #	.project
    #	src/main/java/org/genesys2/server/service/impl/UserServiceImpl.java
    #	src/main/java/org/genesys2/server/servlet/controller/UserProfileController.java
    #	src/main/java/org/genesys2/server/servlet/controller/rest/UsersController.java
    #	src/main/webapp/WEB-INF/jsp/accession/map.jsp
    ba71db05