cms/djangoapps/contentstore · b7830de6182991f72b7a2c24561c445a8ebe14a3 · 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
..
features		Loading commit data...
management		Loading commit data...
migrations		Loading commit data...
tests		Loading commit data...
views		Loading commit data...
__init__.py		Loading commit data...
admin.py		Loading commit data...
context_processors.py		Loading commit data...
course_group_config.py		Loading commit data...
course_info_model.py		Loading commit data...
courseware_index.py		Loading commit data...
debug_file_uploader.py		Loading commit data...
git_export_utils.py		Loading commit data...
models.py		Loading commit data...
proctoring.py		Loading commit data...
push_notification.py		Loading commit data...
signals.py		Loading commit data...
startup.py		Loading commit data...
tasks.py		Loading commit data...
utils.py		Loading commit data...