Merge remote-tracking branch 'origin/v4.7' into v4.8 # Conflicts: # lams_tool_assessment/conf/language/lams/ApplicationResources.properties…
Show more
Merge remote-tracking branch 'origin/v4.7' into v4.8# Conflicts:# lams_tool_assessment/conf/language/lams/ApplicationResources.properties# lams_tool_assessment/web/pages/learning/learning.jsp
Show less
