submission_mixin.py
2.51 KB
-
Merge branch 'master' into sanchez/template-first-crack · 6ac00039
Conflicts: apps/openassessment/peer/api.py apps/openassessment/xblock/openassessmentblock.py apps/openassessment/xblock/static/html/oa_rubric.html apps/openassessment/xblock/static/js/src/oa_submission.js
Stephen Sanchez committed