cms/static/sass/elements · 60d60de2c44dfb91f48a25df5a8e78e64be8a2fb · 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
..
_controls.scss		Loading commit data...
_footer.scss		Loading commit data...
_forms.scss		Loading commit data...
_header.scss		Loading commit data...
_icons.scss		Loading commit data...
_modal.scss		Loading commit data...
_navigation.scss		Loading commit data...
_sock.scss		Loading commit data...
_system-feedback.scss		Loading commit data...
_system-help.scss		Loading commit data...
_tender-widget.scss		Loading commit data...
_typography.scss		Loading commit data...
_vendor.scss		Loading commit data...