account.py
14.2 KB
-
Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form · 458186f7
Conflicts: lms/djangoapps/student_account/test/test_views.py lms/djangoapps/student_account/urls.py lms/djangoapps/student_account/views.py
Will Daly committed