lams-github

Clone
Marcin Cieslak
committed
242fb55
on 06 Dec 19
Merge remote-tracking branch 'origin/develop' into LDEV-4745
Conflicts:
lams_admin/conf/language/lams/ApplicationResources.properties
lams… Show more
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

Show less