lams-github / lams_tool_laqa / web / monitoring

MonitoringMaincontent.jsp

Tree
Options

95a88e5

Merge branch 'develop' into LDEV-4745
# Conflicts:
# lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java
# lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java
# lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java
# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/GeneralLearnerFlowDTO.java
# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaQueContent.java
# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaUtils.java
# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java
# lams_tool_laqa/web/learning/LearnerRep.jsp
# lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp

11 Dec 19 Andrey Balan 95a88e5e56253d7007ebf634b6969cb353d7cf1e

Loading ...