lams-github

Clone
Marcin Cieslak
committed
d34cc27
on 21 Nov 19
Merge remote-tracking branch 'origin/master' into develop
Conflicts:
lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java… Show more
Merge remote-tracking branch 'origin/master' into develop

Conflicts:

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

        lams_central/web/includes/javascript/authoring/authoringGeneral.js

        lams_central/web/includes/javascript/authoring/authoringProperty.js

Show less