lms/static/sass/course · 4b59e7d5513657bb48b55b6a40c0d163933ce078 · 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
..
base		Loading commit data...
courseware		Loading commit data...
discussion		Loading commit data...
instructor		Loading commit data...
layout		Loading commit data...
wiki		Loading commit data...
_discussions-inline.scss		Loading commit data...
_gradebook.scss		Loading commit data...
_info.scss		Loading commit data...
_open_ended_grading.scss		Loading commit data...
_profile.scss		Loading commit data...
_rubric.scss		Loading commit data...
_staff_grading.scss		Loading commit data...
_syllabus.scss		Loading commit data...
_tabs.scss		Loading commit data...
_textbook.scss		Loading commit data...