Chris Dodge b640866748 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements ...

Conflicts:
	common/lib/xmodule/xmodule/x_module.py

2013-04-03 14:05:59 -04:00

..

test_files

…

xmodule

Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements

2013-04-03 14:05:59 -04:00

.coveragerc

…

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 remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-08 00:40:18 -05:00