Merge remote-tracking branch 'origin/authoring' into will/js-refactor-assessment-editing
Conflicts: openassessment/xblock/static/css/openassessment.css openassessment/xblock/static/js/openassessment.min.js openassessment/xblock/static/js/src/oa_edit.js
Showing
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
Please
register
or
sign in
to comment