Chris Dodge 48cbf38a41 resolve merge conflicts

2013-01-17 09:36:09 -05:00

..

test_files

Merge remote-tracking branch 'origin/master' into dormsbee/multicourse

2012-07-05 16:22:50 -04:00

xmodule

resolve merge conflicts

2013-01-17 09:36:09 -05:00

.coveragerc

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

jasmine_test_runner.html.erb

Merge with cms-master.

2013-01-07 09:59:08 -05:00

setup.py

resolve merge conflicts

2013-01-17 09:36:09 -05:00