submission_mixin.py
13.9 KB
-
Merge remote-tracking branch 'origin/master' into authoring · a8f25efd
Conflicts: AUTHORS openassessment/xblock/static/css/openassessment.css openassessment/xblock/static/js/openassessment.min.js openassessment/xblock/submission_mixin.py openassessment/xblock/test/data/update_from_xml.json openassessment/xblock/test/test_submission.py openassessment/xblock/test/test_xml.py openassessment/xblock/xml.py
Will Daly committed