Merge remote-tracking branch 'origin/v4.7' into v4.8 # Conflicts: # lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/we…
Show more
Merge remote-tracking branch 'origin/v4.7' into v4.8# Conflicts:# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java# lams_tool_scratchie/web/pages/authoring/authoring.jsp
Show less
