Calen Pennington 0fff578e7d Merge remote-tracking branch 'origin/master' into feature/cale/cms-master ...

Conflicts:
	.gitmodules
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/sass/course.scss
	lms/urls.py

2012-11-16 09:03:15 -05:00

..

djangoapps

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

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

envs

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

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

templates

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

2012-11-16 09:03:15 -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