common/lib/capa · 024789dabf8f98ace1dc5ab7b6c53eb5cdb1c0b7 · edx / edx-platform

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

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

9b90068e

Name	Last commit	Last update
..
templates		Loading commit data...
__init__.py		Loading commit data...
calc.py		Loading commit data...
capa_problem.py		Loading commit data...
checker.py		Loading commit data...
correctmap.py		Loading commit data...
eia.py		Loading commit data...
inputtypes.py		Loading commit data...
responsetypes.py		Loading commit data...
util.py		Loading commit data...