base-style.scss
1.07 KB
-
Merge branch 'master' into feature/btalbot/studio-checklists · 8ca6e324
Conflicts: cms/djangoapps/contentstore/views.py cms/static/sass/base-style.scss cms/urls.py
cahrens committed
Conflicts: cms/djangoapps/contentstore/views.py cms/static/sass/base-style.scss cms/urls.py