header.html
5.87 KB
-
Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into… · 9f5eeaf8
Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding Conflicts: cms/templates/settings.html cms/templates/widgets/header.html
Don Mitchell committed