oa_container.js
5.97 KB
-
Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/fix-option-deletion-wrapper · 0dfc8fe6
Conflicts: openassessment/xblock/static/css/openassessment.css openassessment/xblock/static/js/openassessment-lms.min.js
gradyward committed