runtime.py
6.58 KB
-
Merge branch 'will/third-party-auth-fixes' into will/combine-reg-login-form · 48bc4776
Conflicts: common/djangoapps/third_party_auth/__init__.py common/djangoapps/third_party_auth/pipeline.py
Will Daly committed
Conflicts: common/djangoapps/third_party_auth/__init__.py common/djangoapps/third_party_auth/pipeline.py