Calen Pennington 8c54d5d610 Fix accidental force push that reset master ...

Master went from 5d912b88616f05c5ec10e89b336bd1088042bba0 to
e43c2bd410. 5d912b8a is a merge commit
that merged a branch onto master, so I am merging the same commit
back into master.

2013-04-26 10:50:53 -04:00

..

djangoapps

ModuleStoreTestCase moved to new location

2013-04-24 11:33:47 -04:00

envs

Merge pull request #1871 from MITx/feature/cale/fast-dev-server

2013-04-24 12:12:05 -07:00

static

Merge pull request #1871 from MITx/feature/cale/fast-dev-server

2013-04-24 12:12:05 -07:00

templates

Merge branch 'master' of https://github.com/MITx/mitx into feature/i18n

2013-04-24 10:41:09 -04:00

__init__.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

.coveragerc

Change coverage report config to reflect refactoring of terrain files

2013-02-20 09:53:12 -05:00

CHANGELOG.md

Add changelog information

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

manage.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

one_time_startup.py

remove discussion cache, which isn't used

2013-04-05 15:27:50 -04:00

urls.py

Merge branch 'master' of https://github.com/MITx/mitx into feature/i18n

2013-04-24 10:41:09 -04:00

xmodule_namespace.py

Remove duplicated StringyX definitions.

2013-04-24 14:59:32 -04:00