cms/djangoapps/contentstore/tests · 6be6ec4e795a900a53d0fe34ca13da2278049350 · edx / edx-platform · GitLab

History Find file

Merge remote-tracking branch 'origin/master' into release, conflicts resolved · bdfd81d2
```
Conflicts:
	cms/envs/common.py
	common/lib/xmodule/xmodule/seq_module.py
	lms/envs/common.py
	requirements/edx/edx-private.txt
```
Han Su Kim committed Mar 06, 2014
bdfd81d2

Name	Last commit	Last update
..
__init__.py		Loading commit data...
modulestore_config.py		Loading commit data...
test_contentstore.py		Loading commit data...
test_core_caching.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_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...