Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/ORA-689
Conflicts: openassessment/xblock/static/js/openassessment-lms.min.js openassessment/xblock/static/js/openassessment-studio.min.js openassessment/xblock/static/js/src/oa_shared.js
Showing
48.7 KB
24.3 KB
118 KB
This source diff could not be displayed because it is too large.
You can
view the blob
instead.