lms · 55c69a1e13de535801bcda9a668634af970416d5 · edx / edx-platform

Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into… · 55c69a1e

Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info

Conflicts:
	lms/djangoapps/courseware/module_render.py

committed Nov 06, 2012

55c69a1e

Name	Last commit	Last update
..
askbot/skins		Loading commit data...
djangoapps		Loading commit data...
envs		Loading commit data...
lib		Loading commit data...
static		Loading commit data...
templates		Loading commit data...
CHANGELOG.md		Loading commit data...
__init__.py		Loading commit data...
urls.py		Loading commit data...
wsgi.py		Loading commit data...