Fisheye: Diff - lams-github/lams_build/lib/lams/lams.jar

Tree
Options

ba813ea

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

13 Oct 17 Marcin Cieslak ba813ea0cf758315d5d6436ca5e7b68d4b820c8c

602145a

Update LAMS libraries after merge

09 Oct 17 Marcin Cieslak 602145a2b0b9e23fb86cbc5d0a1b25b967bff68b

Loading ...