lms/djangoapps/courseware/tests · aa92320c934c44d5ebd35c31444c7ed50ae9cda0 · edx / edx-platform

Merge branch 'release' into edx-west/release-candidate-try · b6ea50d5

Conflicts:
	common/djangoapps/external_auth/tests/test_shib.py
	common/djangoapps/external_auth/views.py
	common/djangoapps/student/views.py
	lms/envs/common.py
	lms/envs/test.py

committed Jun 28, 2013

b6ea50d5

Name	Last commit	Last update
..
load_tests		Loading commit data...
__init__.py		Loading commit data...
factories.py		Loading commit data...
test_access.py		Loading commit data...
test_courses.py		Loading commit data...
test_login.py		Loading commit data...
test_masquerade.py		Loading commit data...
test_model_data.py		Loading commit data...
test_module_render.py		Loading commit data...
test_progress.py		Loading commit data...
test_tabs.py		Loading commit data...
test_video_mongo.py		Loading commit data...
test_videoalpha_mongo.py		Loading commit data...
test_videoalpha_xml.py		Loading commit data...
test_views.py		Loading commit data...
tests.py		Loading commit data...