lams-github / lams_tool_scratchie / conf / language / lams

ApplicationResources.properties

Tree
Options

242fb55

Merge remote-tracking branch 'origin/develop' into LDEV-4745
Conflicts:
lams_admin/conf/language/lams/ApplicationResources.properties
lams_tool_assessment/conf/language/lams/ApplicationResources.properties
lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
lams_tool_lamc/conf/language/lams/ApplicationResources.properties
lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties
lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties
lams_tool_laqa/web/learning/CombinedAnswersContent.jsp
lams_tool_laqa/web/learning/Notebook.jsp
lams_tool_laqa/web/learning/SequentialAnswersContent.jsp
lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties

06 Dec 19 Marcin Cieslak 242fb55e2d8a84388c3a7eb168f86c4f4ab2437b

47f01da

Merge branch 'master' into develop
# Conflicts:
# lams_admin/conf/language/lams/ApplicationResources.properties
# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
# lams_gradebook/conf/language/lams/ApplicationResources_el_GR.properties
# lams_learning/conf/language/lams/ApplicationResources_el_GR.properties
# lams_monitoring/conf/language/lams/ApplicationResources.properties
# lams_monitoring/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_chat/conf/language/lams/ApplicationResources.properties
# lams_tool_chat/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_daco/conf/language/lams/ApplicationResources.properties
# lams_tool_daco/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_forum/conf/language/lams/ApplicationResources.properties
# lams_tool_forum/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_images/conf/language/lams/ApplicationResources.properties
# lams_tool_images/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_imscc/conf/language/lams/ApplicationResources.properties
# lams_tool_imscc/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_lamc/conf/language/lams/ApplicationResources.properties
# lams_tool_lamc/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties
# lams_tool_lamc/conf/language/lams/ApplicationResources_es_ES.properties
# lams_tool_laqa/conf/language/lams/ApplicationResources.properties
# lams_tool_laqa/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties
# lams_tool_larsrc/conf/language/lams/ApplicationResources.properties
# lams_tool_larsrc/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_leader/conf/language/lams/ApplicationResources.properties
# lams_tool_mindmap/conf/language/lams/ApplicationResources.properties
# lams_tool_mindmap/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_nb/conf/language/lams/ApplicationResources.properties
# lams_tool_nb/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_notebook/conf/language/lams/ApplicationResources.properties
# lams_tool_notebook/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_preview/conf/language/lams/ApplicationResources.properties
# lams_tool_preview/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_sbmt/conf/language/lams/ApplicationResources.properties
# lams_tool_sbmt/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties
# lams_tool_sbmt/conf/language/lams/ApplicationResources_es_ES.properties
# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
# lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
# lams_tool_scribe/conf/language/lams/ApplicationResources.properties
# lams_tool_scribe/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties
# lams_tool_spreadsheet/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_survey/conf/language/lams/ApplicationResources.properties
# lams_tool_survey/conf/language/lams/ApplicationResources_el_GR.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_vote/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_wiki/conf/language/lams/ApplicationResources.properties
# lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties

04 Dec 19 Andrey Balan 47f01daecb191d1ca81eaf131b1d063b2bc640b5

Loading ...