Christina Roberts 2306e7c1e8 Merge pull request #1417 from MITx/feature/christina/misc2 ...

Try, try again.

2013-02-04 12:56:26 -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 #1417 from MITx/feature/christina/misc2

2013-02-04 12:56:26 -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

initial implementation of conditional_module; doesn't load dynamically yet

2013-02-03 18:53:51 -05:00