lms/djangoapps/courseware/tests · f77aaec392711adbffd5b96c11b04acc2ad1da7c · edx / edx-platform

Merge branch 'master' into bug/christina/studio · 8ace7fe5

Conflicts:
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py

committed Apr 01, 2013

8ace7fe5

Name	Last commit	Last update
..
__init__.py		Loading commit data...
factories.py		Loading commit data...
test_access.py		Loading commit data...
test_login.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...