course.scss
1.43 KB
-
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
Diana Huang committed