lms/envs · c475f2830ea08a5c7a28fe95e61b15d0bfa506cd · 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
..
cms		Loading commit data...
__init__.py		Loading commit data...
acceptance.py		Loading commit data...
aws.py		Loading commit data...
aws_migrate.py		Loading commit data...
bok_choy.auth.json		Loading commit data...
bok_choy.env.json		Loading commit data...
bok_choy.py		Loading commit data...
common.py		Loading commit data...
content.py		Loading commit data...
dev.py		Loading commit data...
dev_with_worker.py		Loading commit data...
devplus.py		Loading commit data...
devstack.py		Loading commit data...
devstack_optimized.py		Loading commit data...
discussionsettings.py		Loading commit data...
load_test.py		Loading commit data...
sauce.py		Loading commit data...
static.py		Loading commit data...
test.py		Loading commit data...
test_static_optimized.py		Loading commit data...
test_with_mysql.py		Loading commit data...
yaml_config.py		Loading commit data...