schema.py
3.8 KB
-
Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/ai-authoring · 58f45d79
Conflicts: openassessment/xblock/defaults.py openassessment/xblock/static/css/openassessment.css openassessment/xblock/static/js/openassessment-studio.min.js openassessment/xblock/studio_mixin.py openassessment/xblock/test/data/invalid_update_xblock.json openassessment/xblock/test/data/update_xblock.json openassessment/xblock/test/test_studio.py
gradyward committed