Merge branch 'master' into store_rubrics
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
Showing
Please
register
or
sign in
to comment