Merge branch 'master' into develop Conflicts: lams_admin/conf/language/lams/ApplicationResources.properties lams_admin/conf/language/lams…
Show more
Merge branch 'master' into develop Conflicts: lams_admin/conf/language/lams/ApplicationResources.properties lams_admin/conf/language/lams/ApplicationResources_el_GR.properties lams_admin/conf/language/lams/ApplicationResources_en_AU.properties lams_admin/conf/language/lams/ApplicationResources_es_ES.properties lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties
Show less
