Merge remote-tracking branch 'origin/master' into v4.0 Conflicts: lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp lams_tool_…
Show more
Merge remote-tracking branch 'origin/master' into v4.0Conflicts: lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp lams_tool_assessment/web/pages/authoring/parts/questionlistRestricted.jsp lams_tool_laqa/web/authoring/itemlist.jsp lams_tool_scratchie/web/pages/authoring/parts/answerlist.jsp
Show less
