Brian Talbot 6014a7a299 Merge remote-tracking branch 'origin/feature/cale/cms-master' into feature/btalbot/cms-settings ...

Conflicts:
	cms/djangoapps/contentstore/views.py

2012-11-15 16:51:53 -05:00

..

management

wip: static asset import

2012-10-11 12:10:28 -04:00

tests

Use xmodule.templates instead of hard coding them in the test

2012-11-13 08:35:22 -05:00

__init__.py

Initial port of templates into filesystem based storage

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

utils.py

address feedback from cale

2012-11-08 13:29:46 -05:00

views.py

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

2012-11-15 16:51:53 -05:00