lams-github / lams_central / 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

27a03de

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

02 Nov 19 Andrey Balan 27a03def8215e26737b44b5aaa2415b27a4a3f83

Loading ...