lms/djangoapps/ccx/tests · 21c2d3f7bd7d04c6f40a65da933065ca40f896a0 · 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
..
__init__.py		Loading commit data...
factories.py		Loading commit data...
test_ccx_modulestore.py		Loading commit data...
test_field_override_performance.py		Loading commit data...
test_models.py		Loading commit data...
test_overrides.py		Loading commit data...
test_tasks.py		Loading commit data...
test_utils.py		Loading commit data...
test_views.py		Loading commit data...