lams-github

Clone
Marcin Cieslak
committed
fd13106
on 11 Apr 23
Merge remote-tracking branch 'origin/v4.6' into v4.7
Conflicts:
lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRol… Show more
Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

        lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java

        lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java

        lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java

Show less