Chris Dodge e70db062b2 Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge ...

Conflicts:
	requirements.txt

2013-01-03 10:46:24 -05:00

..

djangoapps

Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge

2013-01-03 10:46:24 -05:00

envs

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

lib

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

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

static

Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge

2013-01-03 10:46:24 -05:00

templates

Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge

2013-01-03 10:46:24 -05:00

__init__.py

…

.coveragerc

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

CHANGELOG.md

Add comment about the target of change log entries

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

urls.py

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -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