oa_edit.js
8.11 KB
-
Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/assessment-reorder · 218d7513
Conflicts: openassessment/xblock/static/js/openassessment-lms.min.js openassessment/xblock/static/js/openassessment-studio.min.js
gradyward committed