lms/djangoapps/verify_student/tests · 34dd4e59a101e81823e7baab38e63f95e17baa8c · edx / edx-platform · GitLab

History Find file

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 Nov 10, 2014
5085b716

Name	Last commit	Last update
..
__init__.py		Loading commit data...
test_integration.py		Loading commit data...
test_models.py		Loading commit data...
test_ssencrypt.py		Loading commit data...
test_views.py		Loading commit data...