Chris Dodge 625237601f Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/export ...

Conflicts:
	common/lib/xmodule/xmodule/contentstore/content.py
	common/lib/xmodule/xmodule/contentstore/mongo.py

2012-12-27 14:16:40 -05:00

..

djangoapps

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

2012-12-27 14:16:40 -05:00

envs

Merge pull request #1208 from MITx/feature/cdodge/clone-course

2012-12-27 09:26:51 -08:00

static

Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into bug/dhm/dec12

2012-12-19 17:31:30 -05:00

templates

Bug 98: no unit tests b/c it's just text in hmtl

2012-12-26 11:47:42 -05:00

__init__.py

Initial port of templates into filesystem based storage

2012-09-25 10:10:44 -04:00

.coveragerc

Make coverage reports only include code from the source directories

2012-11-08 12:25:12 -05:00

CHANGELOG.md

Add changelog information

2012-11-06 10:34:51 -05:00

manage.py

Fix string layout for readability

2012-06-21 10:59:45 -04:00

urls.py

Cache to debug other branch

2012-12-13 16:34:58 -05:00