Christina Roberts 72dfd4995e Merge pull request #1903 from MITx/fix/cdodge/dangling-verticals-on-delete ...

Fix/cdodge/dangling verticals on delete

2013-04-29 11:58:22 -07:00

..

test_files

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

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

xmodule

Merge pull request #1903 from MITx/fix/cdodge/dangling-verticals-on-delete

2013-04-29 11:58:22 -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

Move xmodule asset gathering out of server startup

2013-04-18 15:19:19 -04:00