lams-github

Clone
Marcin Cieslak
committed
c7c5d74
on 24 Oct 22
Merge remote-tracking branch 'origin/v4.6' into v4.7
Conflicts:
lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ExtServerM… Show more
Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

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

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

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

        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_admin/web/integration/ltiConsumerList.jsp

        lams_admin/web/signupmanagement/list.jsp

Show less