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

Tree
Options

266434d

Monthly merge from master to lams31
Conflicts:
lams_build/3rdParty.userlibraries
lams_build/build.xml
lams_build/conf/j2ee/jboss-deployment-structure.xml
lams_build/lib/lams/lams.jar
lams_build/liblist.txt
lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

18 Jul 18 Marcin Cieslak 266434d5ec15cc4026c93a740c3110c046b1d88a

1b036cb

Monthly merge from master to lams31
Conflicts:
lams_build/lib/lams/lams.jar
lams_central/src/java/org/lamsfoundation/lams/web/RatingServlet.java
lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java
lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
lams_tool_mindmap/.classpath
lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

24 Jun 18 Marcin Cieslak 1b036cb2e23c7358b8b44b47c4a131853d2075d1

Loading ...