Merge branch 'master' into develop Conflicts: lams_central/src/java/org/lamsfoundation/lams/web/controller/LtiController.java lams_common…
Show more
Merge branch 'master' into develop Conflicts: lams_central/src/java/org/lamsfoundation/lams/web/controller/LtiController.java lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
Show less
