Files
edx-platform/cms/templates/widgets
Don Mitchell 9f5eeaf815 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
2013-02-07 14:56:48 -05:00
..