Commit 5085b716 authored 10 years ago by Will Daly

Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form

Conflicts:
	common/djangoapps/third_party_auth/pipeline.py
	lms/djangoapps/verify_student/tests/test_views.py

No related merge requests found

Showing with 278 additions and 173 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Please register or to comment