Chris Dodge e70db062b2 Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge ...

Conflicts:
	requirements.txt

2013-01-03 10:46:24 -05:00

..

djangoapps

Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge

2013-01-03 10:46:24 -05:00

lib

Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge

2013-01-03 10:46:24 -05:00

static

Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge

2013-01-03 10:46:24 -05:00

templates

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

2012-12-07 11:17:41 -05:00

test

Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge

2013-01-03 10:46:24 -05:00

xml_cleanup.py

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

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