Vik Paruchuri ad9400a0ef Merge remote-tracking branch 'origin/master' into feature/vik/oe-messages ...

Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py

2013-02-20 16:43:04 -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/oe-messages

2013-02-20 16:43:04 -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

2013-02-14 12:49:14 -05:00