Calen Pennington 3e568667fc Fix merge badness

2012-12-07 11:24:25 -05:00

..

djangoapps

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

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

lib

Fix merge badness

2012-12-07 11:24:25 -05:00

static

Merge pull request #1053 from MITx/feature/jzoldak/common-jasmine-tests

2012-11-16 13:35:19 -08:00

templates

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

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

test

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

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

xml_cleanup.py

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

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