Feanil Patel 95f31e5036 Merge remote-tracking branch 'origin/release'

2014-02-07 17:07:29 -05:00

..

djangoapps

Merge remote-tracking branch 'origin/release'

2014-02-07 17:07:29 -05:00

lib

Merge pull request #2221 from cpennington/xblock-xml-serialization

2014-02-07 16:46:46 -05:00

static

don't show the add response button if responses are not allowed.

2014-02-05 12:49:52 -05:00

templates

Image Modal CMS HTML Block subtype

2014-02-07 09:21:20 -08:00

test

Merge pull request #2221 from cpennington/xblock-xml-serialization

2014-02-07 16:46:46 -05:00

.gitignore

Gitignore jasmine_test_runner.html in the appropriate place.

2013-05-16 12:39:48 -04:00

xml_cleanup.py

Pep8 autofixes

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