_footer.scss
7.91 KB
-
Merge branch 'will/logistration-third-party-auth-fixes' into will/combine-reg-login-form · a971e717
Conflicts: common/djangoapps/course_modes/views.py
Diana Huang committed
Conflicts: common/djangoapps/course_modes/views.py