lams-github

Clone
Andrey Balan
committed
3cb5f91
on 12 Dec 19
Merge branch 'master' into develop
# Conflicts:
# lams_admin/conf/language/lams/ApplicationResources.properties
# lams_admin/conf/language/l… Show more
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

Show less