lms/djangoapps/courseware · 9be101acdbf090a512d115d2b5cafc4e0639b863 · edx / edx-platform

Merge branch 'stable-edx4edx' of github.com:MITx/mitx · 9be101ac

Conflicts:
	common/lib/xmodule/seq_module.py
	common/lib/xmodule/xmodule/capa_module.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/multicourse/multicourse_settings.py

committed Jul 08, 2012

9be101ac

Name	Last commit	Last update
..
management		Loading commit data...
migrations		Loading commit data...
__init__.py		Loading commit data...
admin.py		Loading commit data...
course_settings.py		Loading commit data...
grades.py		Loading commit data...
models.py		Loading commit data...
module_render.py		Loading commit data...
progress.py		Loading commit data...
urls.py		Loading commit data...
views.py		Loading commit data...