lams-github

Clone
Marcin Cieslak
committed
7a37ae5
on 15 Sep 18
Merges Asia's and Andrey's changes into LDEV-4440
Conflicts:
lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/acti… Show more
Merges Asia's and Andrey's changes into LDEV-4440

Conflicts:

        lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java

        lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/ClearSessionAction.java

        lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java

        lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

Show less