cms/static/js/views · 3088e60d79acaf1a19b1c2023fcebdbfbab4217a · edx / edx-platform

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

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

committed Feb 12, 2013

d569c559

Name	Last commit	Last update
..
settings		Loading commit data...
course_info_edit.js		Loading commit data...
grader-select-view.js		Loading commit data...
overview.js		Loading commit data...
server_error.js		Loading commit data...
validating_view.js		Loading commit data...