lms/djangoapps/courseware/tests · 7b3ab952f3a2bc185682cac71d0588dfa1d8ecb3 · edx / edx-platform

Merge remote-tracking branch 'origin/feature/kluo/bulk-email-squashed' into… · c534a2d5

Merge remote-tracking branch 'origin/feature/kluo/bulk-email-squashed' into edx-west/release-candidate-20130729

Conflicts:
	common/lib/xmodule/xmodule/course_module.py
	lms/djangoapps/courseware/views.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/templates/courseware/courseware.html

committed Jul 25, 2013

c534a2d5

Name	Last commit	Last update
..
load_tests		Loading commit data...
__init__.py		Loading commit data...
factories.py		Loading commit data...
helpers.py		Loading commit data...
modulestore_config.py		Loading commit data...
test_access.py		Loading commit data...
test_courses.py		Loading commit data...
test_draft_modulestore.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_navigation.py		Loading commit data...
test_progress.py		Loading commit data...
test_submitting_problems.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_view_authentication.py		Loading commit data...
test_views.py		Loading commit data...
test_word_cloud.py		Loading commit data...
tests.py		Loading commit data...