David Ormsbee 80843c1561 Merge pull request #1463 from MITx/feature/brian/pearson-exam ...

Feature/brian/pearson exam

2013-02-08 11:07:15 -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 #1463 from MITx/feature/brian/pearson-exam

2013-02-08 11:07:15 -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

merge out from master

2013-02-07 17:40:54 -05:00