Don Mitchell d569c559ca Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding ...

Conflicts:
	cms/djangoapps/contentstore/views.py
	cms/static/js/views/settings/main_settings_view.js
	cms/templates/index.html
	cms/templates/settings.html

2013-02-12 16:57:00 -05:00

..

auth

Pep8 autofixes

2013-02-06 11:13:50 -05:00

contentstore

Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding

2013-02-12 16:57:00 -05:00

models

Pep8 autofixes

2013-02-06 11:13:50 -05:00

__init__.py

Move models from common to cms.

2012-12-03 12:20:15 -05:00