Chris Dodge 48cbf38a41 resolve merge conflicts

2013-01-17 09:36:09 -05:00

..

djangoapps

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

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

lib

resolve merge conflicts

2013-01-17 09:36:09 -05:00

static

GST work in progress.

2013-01-15 12:55:13 +02:00

templates

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

2012-12-07 11:17:41 -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