Brian Talbot 1a68d516fb resolving local merge with master

2013-04-05 15:27:08 -04:00

..

test_files

…

xmodule

resolving local merge with master

2013-04-05 15:27:08 -04: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 remote-tracking branch 'origin/master' into feature/alex/poll-merged

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