Christina Roberts 8c4b661292 Merge pull request #1434 from MITx/bug/btalbot/studio-boldblockquote ...

studio - resolved HTML display issue with bold and blockquote

2013-02-05 13:13:44 -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 #1434 from MITx/bug/btalbot/studio-boldblockquote

2013-02-05 13:13:44 -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 pull request #1421 from MITx/feature/vik/peer-grading-xmodule

2013-02-05 12:55:48 -08:00