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

..

test_files

Merge remote-tracking branch 'origin/master' into dormsbee/multicourse

2012-07-05 16:22:50 -04:00

xmodule

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

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

.coveragerc

Exclude settings.py files from coverage reports and configure titles for the reports.

2012-12-17 15:00:11 -05:00

setup.py

first working version of gst module

2013-01-15 12:51:54 +02:00