lams-github

Conflicts:

        lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java

        lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

        lams_tool_assessment/web/pages/learning/learning.jsp

        lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

        lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java

        lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

        lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java

        lams_tool_scratchie/web/pages/learning/learning.jsp

Show less