studio_mixin.py
11 KB
-
Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/ORA-668 · 6f4b3a8c
Conflicts: openassessment/xblock/test/test_studio.py
gradyward committed
Conflicts: openassessment/xblock/test/test_studio.py