_developer.scss
23.2 KB
-
Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/ORA-738 · e088432b
Conflicts: openassessment/xblock/static/css/openassessment.css
gradyward committed
Conflicts: openassessment/xblock/static/css/openassessment.css