common/djangoapps/third_party_auth/tests · e4d8b58412ea013cc21d993b82dd8361bc357b47 · edx / edx-platform

Merge remote-tracking branch 'origin/release' into dj18-release-merge · 8d5f1532

Conflicts:
	common/djangoapps/util/testing.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/teams/tests/test_views.py
	openedx/core/djangoapps/programs/models.py
	openedx/core/djangoapps/user_api/accounts/tests/test_views.py
	requirements/edx/github.txt

committed Nov 18, 2015

8d5f1532

Name	Last commit	Last update
..
data		Loading commit data...
specs		Loading commit data...
__init__.py		Loading commit data...
test_decorators.py		Loading commit data...
test_lti.py		Loading commit data...
test_pipeline.py		Loading commit data...
test_pipeline_integration.py		Loading commit data...
test_provider.py		Loading commit data...
test_settings.py		Loading commit data...
test_views.py		Loading commit data...
testutil.py		Loading commit data...
utils.py		Loading commit data...