lams-github

Clone
Marcin Cieslak
committed
0132ac7
on 17 Dec 22
Merge remote-tracking branch 'origin/v4.6' into v4.7
Conflicts:
lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupControll… Show more
Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

        lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupController.java

        lams_central/web/includes/javascript/orgGroup.js

        lams_central/web/orgGroup.jsp

        lams_central/web/orgGrouping.jsp

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

Show less