cahrens 93b0fafea8 Merge branch 'master' into bug/christina/studio ...

Conflicts:
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py

2013-04-01 12:41:34 -04:00

..

djangoapps

Merge pull request #1727 from MITx/feature/will/lettuce_test_helpers

2013-03-28 07:26:14 -07:00

lib

Merge branch 'master' into bug/christina/studio

2013-04-01 12:41:34 -04:00

static

Merge pull request #1589 from MITx/peter/symbolic

2013-03-27 10:40:50 -07:00

templates

Fixed jasmine test issue with cms caused by previous change

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

test

import needs to enumerate through the fields for all content scopes. Also add unit test

2013-03-20 21:37:09 -04:00

xml_cleanup.py

Pep8 autofixes

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