test_staff_info.py
15.4 KB
-
Merge branch 'master' into ai-grading · ac4251dd
Conflicts: apps/openassessment/xblock/static/js/fixtures/templates.json apps/openassessment/xblock/static/js/openassessment.min.js apps/openassessment/xblock/static/js/spec/oa_staff_info.js
Will Daly committed