Merge branch 'master' into develop Conflicts: lams_central/conf/language/lams/ApplicationResources.properties lams_central/conf/language/…
Show more
Merge branch 'master' into develop Conflicts: lams_central/conf/language/lams/ApplicationResources.properties lams_central/conf/language/lams/ApplicationResources_el_GR.properties lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java
Show less
