_settings.scss
29.7 KB
-
Merge branch 'feature/btalbot/cms-settings' of · 8a27e177
git@github.com:MITx/mitx.git into feature/dhm/cms-settings Conflicts: cms/static/sass/bourbon cms/templates/settings.html lms/static/sass/bourbon
Don Mitchell committed