Rocky Duan 8228bebc2a Merge branch 'master' of github.com:MITx/mitx ...

Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/envs/common.py

2012-07-30 17:41:19 -04:00

..

djangoapps

Clean up course_info views

2012-07-27 16:08:23 -04:00

lib

Merge branch 'master' of github.com:MITx/mitx

2012-07-30 17:41:19 -04:00

static

Merge branch 'master' of github.com:MITx/mitx

2012-07-30 17:41:19 -04:00

templates

Allow for modular css from XModules, and split capa module css out as a test

2012-07-24 16:14:04 -04:00

test

Formatting and little bugfixes

2012-07-27 16:09:25 -04:00