Will Daly 5085b71677 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

2014-11-10 15:05:37 -05:00

6.3 KiB

Raw Blame History

View Raw