lms/djangoapps/courseware/tests · c67f1677fde75bfbb6cd25ae60c595e35b9f4f2f · 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...
factories.py		Loading commit data...
test_access.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_views.py		Loading commit data...
tests.py		Loading commit data...