lams-github

Clone
Marcin Cieslak
committed
7b3eba5
on 05 Jan 23
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_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java

        lams_tool_assessment/web/pages/monitoring/summary.jsp

Show less