student_training_mixin.json
2.76 KB
-
Merge branch 'master' into ai-grading · 5d28a7b3
Conflicts: .gitignore apps/openassessment/xblock/static/js/openassessment.min.js openassessment/assessment/test/test_models.py
Will Daly committed
Conflicts: .gitignore apps/openassessment/xblock/static/js/openassessment.min.js openassessment/assessment/test/test_models.py