Files
edx-platform/cms/static/js/views/settings
Don Mitchell f8ee5c2614 Merge branch 'feature/btalbot/cms-settings' of github.com:MITx/mitx into
feature/dhm/cms-settings

Conflicts:
	cms/templates/settings.html
2012-11-20 11:55:19 -05:00
..