mktg_course_about.html
3.72 KB
-
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