Rocky Duan e705bbb764 Merge branch 'discussion2' of github.com:dementrock/mitx ...

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

2012-07-30 17:45:29 -04:00

..

askbot/skins

Add extra_filters_jinja needed for compressed_css filter

2012-07-10 16:22:05 -04:00

djangoapps

Merge branch 'discussion2' of github.com:dementrock/mitx

2012-07-30 17:45:29 -04:00

envs

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

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

lib

basic error handling

2012-07-30 17:16:44 -04:00

static

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

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

templates

fixed bug caused by rearranging stuff

2012-07-30 17:20:30 -04:00

__init__.py

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

urls.py

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

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