lams-github

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

Show less