lms/static/sass/shared · a5001bab2a113d1d2f8a7805c3760fe87ae20f73 · edx / edx-platform · GitLab

History Find file

Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form · a5001bab
```
Conflicts:
	lms/static/sass/base/_grid-settings.scss
	lms/static/sass/shared/_footer.scss
	lms/static/sass/shared/_header.scss
```
Will Daly committed Nov 13, 2014
a5001bab

Name	Last commit	Last update
..
_activation_messages.scss		Loading commit data...
_course_filter.scss		Loading commit data...
_course_object.scss		Loading commit data...
_footer.scss		Loading commit data...
_forms.scss		Loading commit data...
_header.scss		Loading commit data...
_modal.scss		Loading commit data...
_tooltips.scss		Loading commit data...
_unsubscribe.scss		Loading commit data...