Fisheye: Diff - lams-github/lams_tool

Tree
Options

7475d08

LDEV-4440 After updating Eclipse

25 Jul 18 Michal Kowalski <mickowal@hotmail.com> 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80

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 ...