cahrens 731fb209de Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce ...

Conflicts:
	cms/static/css/tiny-mce.css

2013-01-22 16:15:27 -05:00

..

djangoapps

New style base python classes and basestring type.

2013-01-22 11:30:24 -05:00

lib

Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce

2013-01-22 16:15:27 -05:00

static

Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce

2013-01-22 16:15:27 -05:00

templates

Saving work.

2013-01-14 15:41:12 -05:00

test

Merge branch 'master' into feature/cdodge/cms-master-merge4

2013-01-17 09:15:37 -05:00

xml_cleanup.py

{} -> {0} etc in .format statements

2012-08-16 16:22:26 -04:00