Merge remote-tracking branch 'origin/authoring' into will/js-field-validation
Conflicts: openassessment/xblock/static/css/openassessment.css openassessment/xblock/static/js/openassessment-studio.min.js openassessment/xblock/static/js/src/studio/oa_container_item.js openassessment/xblock/static/js/src/studio/oa_edit_rubric.js openassessment/xblock/static/sass/oa/utilities/_developer.scss
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