lms/static/sass/multicourse · aa9440b13997b78ad6b6ce75d0f0e94ca250b76c · edx / edx-platform · GitLab

History Find file

Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form · 5085b716
```
Conflicts:
	common/djangoapps/third_party_auth/pipeline.py
	lms/djangoapps/verify_student/tests/test_views.py
```
Will Daly committed Nov 10, 2014
5085b716

Name	Last commit	Last update
..
_about_pages.scss		Loading commit data...
_account.scss		Loading commit data...
_course_about.scss		Loading commit data...
_courses.scss		Loading commit data...
_dashboard.scss		Loading commit data...
_edge.scss		Loading commit data...
_error-pages.scss		Loading commit data...
_help.scss		Loading commit data...
_home.scss		Loading commit data...
_jobs.scss		Loading commit data...
_media-kit.scss		Loading commit data...
_press_release.scss		Loading commit data...
_survey-page.scss		Loading commit data...