oa_edit_rubric.js
6.34 KB
-
Merge remote-tracking branch 'origin/authoring' into will/js-field-validation · 00d6a0e5
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
Will Daly committed