common/lib/xmodule/xmodule/open_ended_grading_classes · 857a6e0bd0589951a3e0c31acc51445f013f81e2 · 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...
combined_open_ended_modulev1.py		Loading commit data...
combined_open_ended_rubric.py		Loading commit data...
controller_query_service.py		Loading commit data...
grading_service_module.py		Loading commit data...
open_ended_image_submission.py		Loading commit data...
open_ended_module.py		Loading commit data...
openendedchild.py		Loading commit data...
peer_grading_service.py		Loading commit data...
self_assessment_module.py		Loading commit data...
xblock_field_types.py		Loading commit data...