Merge branch 'feature/vik/oe-versioning' into feature/vik/improve-oe-ui
Conflicts: common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee lms/static/sass/course/_staff_grading.scss
Showing
lms/static/sass/course/_rubric.scss
0 → 100644
Please
register
or
sign in
to comment