lms/djangoapps/courseware · db26935afaec0e70a311c755c48bca5203b05f45 · edx / edx-platform

Merge branch 'release' into edx-west/release-candidate-20130903 · 0ddc9cf2

Conflicts:
	CHANGELOG.rst
	cms/djangoapps/contentstore/views/assets.py
	common/lib/xmodule/xmodule/css/combinedopenended/display.scss
	common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
	common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	lms/templates/combinedopenended/openended/open_ended.html
	lms/templates/peer_grading/peer_grading_problem.html

committed Sep 03, 2013

0ddc9cf2

Name	Last commit	Last update
..
features		Loading commit data...
management		Loading commit data...
migrations		Loading commit data...
mock_xqueue_server		Loading commit data...
tests		Loading commit data...
__init__.py		Loading commit data...
access.py		Loading commit data...
admin.py		Loading commit data...
courses.py		Loading commit data...
grades.py		Loading commit data...
masquerade.py		Loading commit data...
model_data.py		Loading commit data...
models.py		Loading commit data...
module_render.py		Loading commit data...
progress.py		Loading commit data...
tabs.py		Loading commit data...
urls.py		Loading commit data...
views.py		Loading commit data...