lams-github

Clone
Marcin Cieslak
committed
ba813ea
on 13 Oct 17
Merge remote-tracking branch 'origin/master' into lams31
Conflicts:
lams_build/lib/lams/lams.jar
lams_central/src/java/org/lamsfoundation/… Show more
Merge remote-tracking branch 'origin/master' into lams31

Conflicts:

        lams_build/lib/lams/lams.jar

        lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

        lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

        lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java

Show less