Vik Paruchuri bf97a6a9a9 Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-xmodule ...

Conflicts:
	lms/djangoapps/open_ended_grading/peer_grading_service.py

2013-02-04 17:55:55 -05:00

..

test_files

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

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

xmodule

Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-xmodule

2013-02-04 17:55:55 -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 remote-tracking branch 'origin/master' into feature/vik/peer-grading-xmodule

2013-02-04 17:55:55 -05:00