Merge branch 'master' into develop # Conflicts: # lams_central/conf/language/lams/ApplicationResources_no_NO.properties # lams_tool_sbmt/src…
Show more
Merge branch 'master' into develop# Conflicts:# lams_central/conf/language/lams/ApplicationResources_no_NO.properties# lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java
Show less
