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
2013-01-15 11:44:27 -05:00
2013-01-15 12:55:25 +02:00
2013-01-16 15:08:55 -05:00
2011-12-07 09:28:16 -05:00
2012-10-24 15:42:03 -04:00
fix
2012-12-20 17:28:53 +02:00
2012-07-17 14:58:09 -04:00
2012-08-21 17:01:25 -04:00
Description
No description provided
Readme AGPL-3.0 2.2 GiB
Languages
Python 73.7%
JavaScript 15.4%
HTML 7.1%
SCSS 3.2%
CSS 0.5%