lams-github / lams_central / conf / language / lams

ApplicationResources.properties

Tree
Options

3cb5f91

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_tool_laqa/web/learning/LearnerRep.jsp
# lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp
# lams_tool_mindmap/conf/language/lams/ApplicationResources.properties
# lams_tool_nb/conf/language/lams/ApplicationResources.properties
# lams_tool_notebook/conf/language/lams/ApplicationResources.properties
# lams_tool_pixlr/conf/language/lams/ApplicationResources.properties
# lams_tool_pixlr/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_scribe/conf/language/lams/ApplicationResources.properties
# lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties
# lams_tool_survey/conf/language/lams/ApplicationResources.properties
# lams_tool_task/conf/language/lams/ApplicationResources.properties
# lams_tool_task/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_vote/conf/language/lams/ApplicationResources.properties
# lams_tool_wiki/conf/language/lams/ApplicationResources.properties
# lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties

12 Dec 19 Andrey Balan 3cb5f91a2d0c7185e16b32d019ec0d2ecb30aaf9

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

Loading ...