lams-github

Clone
Andrey Balan
committed
f27fea8
on 20 Dec 19
Merge branch 'develop' into LDEV-4745
# Conflicts:
# lams_admin/conf/language/lams/ApplicationResources.properties
# lams_admin/conf/languag… Show more
Merge branch 'develop' into LDEV-4745

# Conflicts:

#       lams_admin/conf/language/lams/ApplicationResources.properties

#       lams_admin/conf/language/lams/ApplicationResources_en_AU.properties

#       lams_admin/conf/language/lams/ApplicationResources_es_ES.properties

#       lams_central/conf/language/lams/ApplicationResources.properties

#       lams_central/conf/language/lams/ApplicationResources_en_AU.properties

#       lams_common/src/java/org/lamsfoundation/lams/commonContext.xml

#       lams_learning/conf/language/lams/ApplicationResources.properties

#       lams_learning/conf/language/lams/ApplicationResources_en_AU.properties

#       lams_learning/conf/language/lams/ApplicationResources_es_ES.properties

#       lams_tool_assessment/conf/language/lams/ApplicationResources.properties

#       lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties

#       lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

#       lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml

#       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_en_AU.properties

#       lams_tool_laqa/conf/language/lams/ApplicationResources_es_ES.properties

#       lams_tool_laqa/web/learning/CombinedAnswersContent.jsp

#       lams_tool_laqa/web/learning/IndividualLearnerResults.jsp

#       lams_tool_laqa/web/learning/LearnerRep.jsp

#       lams_tool_laqa/web/learning/SequentialAnswersContent.jsp

#       lams_tool_mindmap/conf/language/lams/ApplicationResources.properties

#       lams_tool_mindmap/conf/language/lams/ApplicationResources_en_AU.properties

#       lams_tool_mindmap/conf/language/lams/ApplicationResources_es_ES.properties

#       lams_tool_nb/conf/language/lams/ApplicationResources.properties

#       lams_tool_nb/conf/language/lams/ApplicationResources_el_GR.properties

#       lams_tool_nb/conf/language/lams/ApplicationResources_en_AU.properties

#       lams_tool_nb/conf/language/lams/ApplicationResources_es_ES.properties

#       lams_tool_notebook/conf/language/lams/ApplicationResources.properties

#       lams_tool_notebook/conf/language/lams/ApplicationResources_el_GR.properties

#       lams_tool_notebook/conf/language/lams/ApplicationResources_en_AU.properties

#       lams_tool_notebook/conf/language/lams/ApplicationResources_es_ES.properties

#       lams_tool_pixlr/conf/language/lams/ApplicationResources.properties

#       lams_tool_pixlr/conf/language/lams/ApplicationResources_en_AU.properties

#       lams_tool_pixlr/conf/language/lams/ApplicationResources_es_ES.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_el_GR.properties

#       lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties

#       lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

#       lams_tool_scribe/conf/language/lams/ApplicationResources.properties

#       lams_tool_scribe/conf/language/lams/ApplicationResources_el_GR.properties

#       lams_tool_scribe/conf/language/lams/ApplicationResources_en_AU.properties

#       lams_tool_scribe/conf/language/lams/ApplicationResources_es_ES.properties

#       lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties

#       lams_tool_spreadsheet/conf/language/lams/ApplicationResources_el_GR.properties

#       lams_tool_spreadsheet/conf/language/lams/ApplicationResources_en_AU.properties

#       lams_tool_spreadsheet/conf/language/lams/ApplicationResources_es_ES.properties

#       lams_tool_survey/conf/language/lams/ApplicationResources.properties

#       lams_tool_survey/conf/language/lams/ApplicationResources_el_GR.properties

#       lams_tool_survey/conf/language/lams/ApplicationResources_en_AU.properties

#       lams_tool_survey/conf/language/lams/ApplicationResources_es_ES.properties

#       lams_tool_task/conf/language/lams/ApplicationResources.properties

#       lams_tool_task/conf/language/lams/ApplicationResources_el_GR.properties

#       lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties

#       lams_tool_task/conf/language/lams/ApplicationResources_es_ES.properties

#       lams_tool_vote/conf/language/lams/ApplicationResources.properties

#       lams_tool_vote/conf/language/lams/ApplicationResources_el_GR.properties

#       lams_tool_vote/conf/language/lams/ApplicationResources_en_AU.properties

#       lams_tool_vote/conf/language/lams/ApplicationResources_es_ES.properties

#       lams_tool_wiki/conf/language/lams/ApplicationResources.properties

#       lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties

#       lams_tool_wiki/conf/language/lams/ApplicationResources_en_AU.properties

#       lams_tool_wiki/conf/language/lams/ApplicationResources_es_ES.properties

Show less