cms/djangoapps/contentstore/tests · a8d07780fc6f9fca11381f16fefb922f6e67fa68 · edx / edx-platform

Merge branch 'release' into andya/merge-hotfix-2014-08-29 · 7b26e854

Conflicts:
	cms/djangoapps/contentstore/tests/test_import.py
	common/lib/xmodule/xmodule/modulestore/__init__.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
	lms/djangoapps/courseware/tests/test_module_render.py

committed Aug 29, 2014

7b26e854

Name	Last commit	Last update
..
__init__.py		Loading commit data...
test_clone_course.py		Loading commit data...
test_contentstore.py		Loading commit data...
test_core_caching.py		Loading commit data...
test_course_create_rerun.py		Loading commit data...
test_course_listing.py		Loading commit data...
test_course_settings.py		Loading commit data...
test_crud.py		Loading commit data...
test_export_git.py		Loading commit data...
test_i18n.py		Loading commit data...
test_import.py		Loading commit data...
test_import_draft_order.py		Loading commit data...
test_import_pure_xblock.py		Loading commit data...
test_orphan.py		Loading commit data...
test_permissions.py		Loading commit data...
test_request_event.py		Loading commit data...
test_transcripts_utils.py		Loading commit data...
test_users_default_role.py		Loading commit data...
test_utils.py		Loading commit data...
tests.py		Loading commit data...
utils.py		Loading commit data...