openassessment.min.js
38.8 KB
-
Merge remote-tracking branch 'origin/authoring' into will/js-refactor-assessment-editing · 2c3e8690
Conflicts: openassessment/xblock/static/css/openassessment.css openassessment/xblock/static/js/openassessment.min.js openassessment/xblock/static/js/src/oa_edit.js
Will Daly committed