cms/static/sass/views · 6629d5d3a3a85a470fe2ba6faba80899c3766049 · edx / edx-platform

Merge branch 'master' into talbs/studio-authorship · 6629d5d3

Conflicts:
	cms/djangoapps/contentstore/views/user.py
	cms/static/sass/elements/_controls.scss
	cms/templates/activation_active.html
	cms/templates/activation_complete.html
	cms/templates/activation_invalid.html

committed Jul 22, 2013

6629d5d3

Name	Last commit	Last update
..
_account.scss		Loading commit data...
_assets.scss		Loading commit data...
_checklists.scss		Loading commit data...
_dashboard.scss		Loading commit data...
_export.scss		Loading commit data...
_import.scss		Loading commit data...
_index.scss		Loading commit data...
_outline.scss		Loading commit data...
_settings.scss		Loading commit data...
_static-pages.scss		Loading commit data...
_subsection.scss		Loading commit data...
_textbooks.scss		Loading commit data...
_unit.scss		Loading commit data...
_updates.scss		Loading commit data...
_users.scss		Loading commit data...