combined_open_ended_rubric.py
6.85 KB
-
Merge branch 'master' into diana/rubric-ui-improvements · 4adf2f61
Conflicts: common/lib/xmodule/xmodule/combined_open_ended_module.py common/lib/xmodule/xmodule/combined_open_ended_rubric.py
Diana Huang committed