lms · 687ab3ddae8917596b75d432bea1f7699b5d7c6d · OpenEdx / edx-platform

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

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

committed Aug 08, 2013

687ab3dd

Name	Last commit	Last update
..
djangoapps		Loading commit data...
envs		Loading commit data...
lib		Loading commit data...
static		Loading commit data...
templates		Loading commit data...
.coveragerc		Loading commit data...
__init__.py		Loading commit data...
one_time_startup.py		Loading commit data...
urls.py		Loading commit data...
wsgi.py		Loading commit data...
wsgi_apache_lms.py		Loading commit data...
xmodule_namespace.py		Loading commit data...