peer_assessment_mixin.py
2.31 KB
-
Merge branch 'master' into store_rubrics · 1c84bf4f
Conflicts: apps/openassessment/xblock/assessment_mixin.py apps/openassessment/xblock/peer_assessment_mixin.py apps/openassessment/xblock/self_assessment_mixin.py apps/openassessment/xblock/test/test_openassessment.py
David Ormsbee committed