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

Conflicts:
	lms/djangoapps/courseware/module_render.py

2012-11-06 14:20:59 -05:00

..

askbot/skins

Added styles for single question and profile view

2012-08-15 13:51:10 -04:00

djangoapps

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

2012-11-06 14:20:59 -05:00

envs

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2012-11-02 11:09:19 -04:00

lib

Merge pull request #731 from MITx/feature/ichuang/symmath_improvements

2012-09-25 19:36:02 -07:00

static

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2012-11-02 11:09:19 -04:00

templates

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

2012-11-06 14:20:59 -05:00

__init__.py

Moving LMS code into subdirectory

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

CHANGELOG.md

Add comment about the target of change log entries

2012-10-30 16:48:47 -04:00

urls.py

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2012-10-23 13:38:11 -04:00

wsgi.py

Add a wsgi file for the lms that loads the modulestores immediately after the application starts

2012-08-28 12:01:05 -04:00