lams-github

Clone
Marcin Cieslak
committed
957baf1
on 01 Oct 17
Merge remote-tracking branch 'origin/master' into LDEV-4366
Conflicts:
lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.jav… Show more
Merge remote-tracking branch 'origin/master' into LDEV-4366

Conflicts:

        lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java

        lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java

        lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java

Show less