Will Daly 458186f7d1 Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form ...

Conflicts:
	lms/djangoapps/student_account/test/test_views.py
	lms/djangoapps/student_account/urls.py
	lms/djangoapps/student_account/views.py

2014-10-20 10:57:05 -04:00

14 KiB

Raw Blame History

View Raw