Arthur Barrett 34cc112cfb Saving work in progress on annotations v2 with classification problems.

2013-02-19 14:18:56 -05:00

..

test_files

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

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

xmodule

Saving work in progress on annotations v2 with classification problems.

2013-02-19 14:18:56 -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

Merge branch 'master' into feature/abarrett/annotatable_xmodule

2013-02-12 12:09:21 -05:00