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

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged · 84f05f9f

Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/foldit_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	common/lib/xmodule/xmodule/tests/test_conditional.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py

committed Mar 08, 2013

84f05f9f

Name	Last commit	Last update
..
__init__.py		Loading commit data...
test_contentstore.py		Loading commit data...
test_core_caching.py		Loading commit data...
test_course_settings.py		Loading commit data...
test_course_updates.py		Loading commit data...
test_utils.py		Loading commit data...
tests.py		Loading commit data...
utils.py		Loading commit data...