Chris Dodge 575ff02f8a Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-master-merge4 ...

Conflicts:
	jenkins/test.sh

2013-01-18 10:26:44 -05:00

..

djangoapps

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

2013-01-17 20:30:22 -05:00

lib

Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-master-merge4

2013-01-18 10:26:44 -05:00

static

studio html editor - added in visual assets needed for previous UI syncing

2013-01-16 16:56:22 -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