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

Conflicts:
	cms/djangoapps/contentstore/views.py

2012-10-02 12:12:55 -04:00

..

djangoapps

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

2012-10-02 12:12:55 -04:00

envs

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

2012-10-02 12:12:55 -04:00

static

in order to avoid using stale modules when editing, clear out the @module variable after a save(). Then on a subsequent edit, it'll get recreated

2012-10-02 11:37:27 -04:00

templates

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

2012-10-02 12:12:55 -04:00

__init__.py

Initial port of templates into filesystem based storage

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

manage.py

Fix string layout for readability

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

urls.py

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

2012-10-02 12:12:55 -04:00