Merge remote-tracking branch 'origin/master' into authoring
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
Showing
openassessment/xblock/leaderboard_mixin.py
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
File added
scripts/jenkins-acceptance-tests.sh
0 → 100755
No preview for this file type
Please
register
or
sign in
to comment