VikParuchuri 01fab2ec68 Merge pull request #1346 from MITx/feature/vik/combined-xmodule-changes ...

Feature/vik/combined xmodule changes

2013-02-01 15:46:33 -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 #1346 from MITx/feature/vik/combined-xmodule-changes

2013-02-01 15:46:33 -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

resolve merge conflicts

2013-01-17 09:36:09 -05:00