This reverts commit f40447b3c8. Conflicts: lms/urls.py Revert "Add support for external auth on the combined login/registration page" This reverts commit 988753395f. Conflicts: lms/templates/courseware/mktg_course_about.html lms/urls.py
f40447b3c8
988753395f