Chris Dodge d9fa723eb2 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules ...

Conflicts:
	common/lib/xmodule/xmodule/modulestore/xml_importer.py

2013-04-10 12:02:16 -04:00

..

djangoapps

fix default giturl link

2013-04-07 00:51:07 +00:00

lib

Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules

2013-04-10 12:02:16 -04:00

static

Merge branch 'master' into feature/btalbot/studio-alerts

2013-04-08 10:28:52 -04:00

templates

Fixed jasmine test issue with cms caused by previous change

2013-03-11 11:27:49 -04:00

test

add a simple Studio walkthough to check page loads

2013-04-08 13:55:38 -04:00

xml_cleanup.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00