lams-github / lams_admin / conf / language / lams

ApplicationResources.properties

Tree
Options

9e39ffb

Merge remote-tracking branch 'origin/master' into v4.0
Conflicts:
lams_admin/conf/language/lams/ApplicationResources.properties

28 Jan 20 Marcin Cieslak 9e39ffbdbc7ea7ceb482f6ab9c0c2a136e959b6c

Merge branch 'LDEV-4745' into v4.0
# Conflicts:
# lams_admin/conf/language/lams/ApplicationResources.properties
# lams_central/conf/language/lams/ApplicationResources.properties
# lams_central/conf/language/lams/ApplicationResources_en_AU.properties
# lams_central/web/includes/javascript/authoring/authoringGeneral.js
# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml
# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

03 Jan 20 Marcin Cieslak 9091ed8c9bae9a48f88622c0c5031af2a39772dc

Loading ...