common/djangoapps/third_party_auth/tests/specs · a13f4f2fe6f66069ef3f1e4c8380dc9a75c3412a · edx / edx-platform · GitLab

History Find file

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 Oct 28, 2014
48bc4776

Name	Last commit	Last update
..
__init__.py		Loading commit data...
base.py		Loading commit data...
test_google.py		Loading commit data...
test_linkedin.py		Loading commit data...