lams-github / lams_admin / conf / language / lams

ApplicationResources.properties

Tree
Options

d34cc27

Merge remote-tracking branch 'origin/master' into develop
Conflicts:
lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java
lams_central/web/includes/javascript/authoring/authoringGeneral.js
lams_central/web/includes/javascript/authoring/authoringProperty.js

21 Nov 19 Marcin Cieslak d34cc270cb398c4db6fe2b8a04e09bbce8cf76ce

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

Loading ...