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

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged · 8a9ba79d

Conflicts:
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py

committed Mar 06, 2013

8a9ba79d

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_views.py		Loading commit data...
tests.py		Loading commit data...