Clone
Marcin Cieslak
committed
on 30 Aug 20
Merge remote-tracking branch 'origin/master' into v4.0
Conflicts:
lams_tool_assessment/web/pages/authoring/advance.jsp
lams_tool_assessmen… Show more
Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

        lams_tool_assessment/web/pages/authoring/advance.jsp

        lams_tool_assessment/web/pages/authoring/authoring.jsp

Show less