cms/djangoapps/contentstore/views · 2cf71b7ff328c79e57c9a709b9b604db05885d04 · edx / edx-platform

Merge branch 'master' into feature/christina/unify-fields · fae8fd38

Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/fields.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/test_fields.py
	requirements/edx/github.txt

committed Jun 13, 2013

fae8fd38

Name	Last commit	Last update
..
__init__.py		Loading commit data...
access.py		Loading commit data...
assets.py		Loading commit data...
checklist.py		Loading commit data...
component.py		Loading commit data...
course.py		Loading commit data...
error.py		Loading commit data...
item.py		Loading commit data...
preview.py		Loading commit data...
public.py		Loading commit data...
requests.py		Loading commit data...
session_kv_store.py		Loading commit data...
tabs.py		Loading commit data...
user.py		Loading commit data...