Vik Paruchuri 687ab3ddae Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui ...

Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/peer_grading_service.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	lms/templates/combinedopenended/combined_open_ended.html
	lms/templates/combinedopenended/combined_open_ended_status.html
	lms/templates/combinedopenended/openended/open_ended.html
	lms/templates/combinedopenended/openended/open_ended_rubric.html
	lms/templates/combinedopenended/selfassessment/self_assessment_prompt.html

2013-08-08 19:03:46 -04:00

..

test_files

Add TabsEditingDescriptor for VideoAlpha

2013-08-05 13:38:32 +03:00

xmodule

Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui

2013-08-08 19:03:46 -04:00

.coveragerc

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

setup.py

Working prototype of crowdsourced hinting module.

2013-07-01 18:03:35 -04:00