Diana Huang 51db547a63 Merge branch 'master' into diana/rubric-ui-improvements ...

Conflicts:
	common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee

2013-02-05 16:18:56 -05:00

..

test_files

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

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

xmodule

Merge branch 'master' into diana/rubric-ui-improvements

2013-02-05 16:18:56 -05: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