Victor Shnayder fb350ed1e3 Merge pull request #1569 from MITx/feature/abarrett/annotatable_xmodule ...

Feature/abarrett/annotatable xmodule DO NOT MERGE

2013-03-06 12:05:27 -08:00

..

test_files

Merge remote-tracking branch 'origin/master' into dormsbee/multicourse

2012-07-05 16:22:50 -04:00

xmodule

Merge pull request #1569 from MITx/feature/abarrett/annotatable_xmodule

2013-03-06 12:05:27 -08: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