openassessment-lms.min.js
30.9 KB
-
Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/ORA-689 · 75b5d5af
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
gradyward committed