Arthur Barrett 1da644fcb3 merge from master. resolved conflict with test_responsetypes.py by using the version from master.

2013-02-28 11:22:32 -05:00

..

test_files

…

xmodule

merge from master. resolved conflict with test_responsetypes.py by using the version from master.

2013-02-28 11:22:32 -05: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

merged from master

2013-02-20 11:07:46 -05:00