Christina Roberts ebeee7a195 Merge pull request #1785 from MITx/fix/cdodge/xml_attribute-as-system-metadata ...

list xml_attributes (new field since xblock integration) as system metad...

2013-04-01 12:24:56 -07:00

..

test_files

…

xmodule

Merge pull request #1785 from MITx/fix/cdodge/xml_attribute-as-system-metadata

2013-04-01 12:24:56 -07:00

.coveragerc

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

jasmine_test_runner.html.erb

Clean up some JS errors showing up in the xmodule jasmine tests

2013-01-30 09:31:20 -05:00

setup.py

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-08 00:40:18 -05:00