lms/djangoapps/open_ended_grading · f49b5ec771212c38c31f1c274ff53a5b088fc4a2 · edx / edx-platform

Merge branch 'master' into diana/rubric-ui-improvements · f49b5ec7

Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_rubric.py
	common/lib/xmodule/xmodule/self_assessment_module.py
	lms/djangoapps/open_ended_grading/grading_service.py
	lms/static/sass/course.scss

committed Feb 04, 2013

f49b5ec7

Name	Last commit	Last update
..
__init__.py		Loading commit data...
controller_query_service.py		Loading commit data...
grading_service.py		Loading commit data...
open_ended_notifications.py		Loading commit data...
open_ended_util.py		Loading commit data...
peer_grading_service.py		Loading commit data...
staff_grading.py		Loading commit data...
staff_grading_service.py		Loading commit data...
tests.py		Loading commit data...
views.py		Loading commit data...