lms/djangoapps/open_ended_grading · e4bcfa5c219eb2270eaea15754e82e3103245c60 · edx / 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
..
__init__.py		Loading commit data...
open_ended_notifications.py		Loading commit data...
staff_grading.py		Loading commit data...
staff_grading_service.py		Loading commit data...
tests.py		Loading commit data...
utils.py		Loading commit data...
views.py		Loading commit data...