grading_service.py
4.74 KB
-
Merge branch 'master' into diana/open-ended-ui-updates · 2e791043
Conflicts: common/lib/xmodule/xmodule/combined_open_ended_rubric.py common/lib/xmodule/xmodule/open_ended_module.py common/lib/xmodule/xmodule/self_assessment_module.py
Diana Huang committed