lms/envs · 9b90068e03cdcb7bac8f61086a1a8d66cd29f68c · 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
..
README.txt		Loading commit data...
__init__.py		Loading commit data...
askbotsettings.py		Loading commit data...
aws.py		Loading commit data...
common.py		Loading commit data...
content.py		Loading commit data...
dev.py		Loading commit data...
dev_edx4edx.py		Loading commit data...
dev_ike.py		Loading commit data...
devplus.py		Loading commit data...
edx4edx_aws.py		Loading commit data...
logsettings.py		Loading commit data...
static.py		Loading commit data...
test.py		Loading commit data...
test_ike.py		Loading commit data...

README.txt