Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/fix-option-deletion-wrapper
Conflicts: openassessment/xblock/static/css/openassessment.css openassessment/xblock/static/js/openassessment-lms.min.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