muhammad-ammar 8d5f153201 Merge remote-tracking branch 'origin/release' into dj18-release-merge ...

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

2015-11-18 17:53:44 +05:00

..

test_files

…

xmodule

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

2015-11-18 17:53:44 +05:00

setup.py

Upgrade setuptools to 18.0.1

2015-07-30 16:22:42 -04:00