combined_open_ended_rubric.py
5.56 KB
-
Merge branch 'master' into feature/diana/rubric-input · dd20226e
Fix some merge issues involving rubric rendering 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