_cms_mixins.scss
4.5 KB
-
Merge branch 'feature/btalbot/cms-gradable' of github.com:MITx/mitx into… · 909fd93c
Merge branch 'feature/btalbot/cms-gradable' of github.com:MITx/mitx into feature/btalbot/cms-gradable Conflicts: cms/static/sass/_variables.scss
Don Mitchell committed