Merge remote-tracking branch 'origin/v4.7' into SP-9 # Conflicts: # lams_central/conf/language/lams/ApplicationResources.properties # lams_m…
Show more
Merge remote-tracking branch 'origin/v4.7' into SP-9# Conflicts:# lams_central/conf/language/lams/ApplicationResources.properties# lams_monitoring/web/includes/javascript/monitorLesson.js# lams_tool_assessment/web/pages/monitoring/summary.jsp# lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp
Show less