lms/djangoapps · 7860e013adbceddb8066a26ff035917f9c3931ac · 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
..
branding		Loading commit data...
certificates		Loading commit data...
circuit		Loading commit data...
course_wiki		Loading commit data...
courseware		Loading commit data...
dashboard		Loading commit data...
django_comment_client		Loading commit data...
instructor		Loading commit data...
licenses		Loading commit data...
lms_migration		Loading commit data...
multicourse		Loading commit data...
open_ended_grading		Loading commit data...
portal		Loading commit data...
psychometrics		Loading commit data...
simplewiki		Loading commit data...
static_template_view		Loading commit data...
staticbook		Loading commit data...
terrain		Loading commit data...