lams-github / lams_admin / conf / language / lams

ApplicationResources.properties

Tree
Options

815b617

Merge remote-tracking branch 'origin/master' into develop
Conflicts:
lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/CompleteActivityController.java
lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java
lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java
lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/SequenceActivityController.java
lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java

18 Nov 19 Marcin Cieslak 815b617ce48bcd3dc0a36aa32630ca55d4c21715

7783b8d

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

27 Oct 19 Andrey Balan 7783b8ddec2b73369154eda24b45fe5c5f66634c

Loading ...