lams-github

Conflicts:

        lams_central/conf/language/lams/ApplicationResources_en_AU.properties

        lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java

        lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

        lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java

        lams_central/web/questions/questionFile.jsp

        lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql

        lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190724.sql

        lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

        lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java

        lams_tool_assessment/web/pages/monitoring/summary.jsp

        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_lamc/conf/language/lams/ApplicationResources_fr_FR.properties

        lams_tool_lamc/conf/language/lams/ApplicationResources_no_NO.properties

        lams_tool_lamc/db/sql/activity_insert.sql

        lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml

        lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

        lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag

        lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag

        lams_tool_lamc/web/WEB-INF/tags/Rating.tag

        lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag

        lams_tool_lamc/web/authoring/BasicContent.jsp

        lams_tool_lamc/web/authoring/editQuestionBox.jsp

        lams_tool_lamc/web/authoring/itemlist.jsp

Show less