Don Mitchell a9233dfd44 Merge branch 'course-info' into feature/dhm/cms-settings ...

Conflicts:
	cms/djangoapps/contentstore/views.py

2012-11-19 16:00:27 -05:00

..

djangoapps

Merge branch 'master' into feature/victor/actual-askbot-removal

2012-11-15 14:24:55 -05:00

envs

Revert overly aggressive killing.

2012-11-19 10:24:41 -05:00

lib

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

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

static

Merge branch 'course-info' into feature/dhm/cms-settings

2012-11-19 16:00:27 -05:00

templates

add press mentions for October, update missing logos, and add sorting.

2012-11-19 10:28:40 -05:00

__init__.py

…

.coveragerc

Make coverage reports only include code from the source directories

2012-11-08 12:25:12 -05: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-11-16 09:03:15 -05: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