Diana Huang dd20226ec3 Merge branch 'master' into feature/diana/rubric-input ...

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

2013-01-18 16:36:22 -05:00

..

capa

Use the new CombinedOpenEndedRubric class for everything

2013-01-14 14:46:44 -05:00

xmodule

Merge branch 'master' into feature/diana/rubric-input

2013-01-18 16:36:22 -05:00

supertrace.py

add a handy supertrace script

2012-08-02 11:33:04 -04:00