common/djangoapps/external_auth/tests · 7b3ab952f3a2bc185682cac71d0588dfa1d8ecb3 · edx / edx-platform · GitLab

History Find file

Merge remote-tracking branch 'origin/release' into edx-west/release-candidate-20130711 · a879b3ee
```
Conflicts:
	cms/templates/widgets/header.html
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/courseware/tests/test_courses.py
```
Jason Bau committed Jul 11, 2013
a879b3ee

Name	Last commit	Last update
..
__init__.py		Loading commit data...
test_openid_provider.py		Loading commit data...
test_shib.py		Loading commit data...