Fisheye: Diff - lams-github/lams_build/unix.properties

Tree
Options

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

9737423

CLOUD-88: Ooopss
Sorry, didn't mean to commit these two files.

15 Jun 18 Ernie Ghiglione <ernieg@gmail.com> 9737423f5e8e1d83315339bc0fe8330946845759

Loading ...