Merge remote-tracking branch 'origin/master' into authoring
Conflicts: Makefile openassessment/templates/openassessmentblock/peer/oa_peer_assessment.html openassessment/templates/openassessmentblock/self/oa_self_assessment.html openassessment/xblock/data_conversion.py openassessment/xblock/grade_mixin.py openassessment/xblock/peer_assessment_mixin.py openassessment/xblock/self_assessment_mixin.py openassessment/xblock/static/css/openassessment.css openassessment/xblock/static/js/src/oa_server.js openassessment/xblock/studio_mixin.py openassessment/xblock/xml.py
Showing
48.7 KB
24.3 KB
118 KB
This source diff could not be displayed because it is too large.
You can
view the blob
instead.