Vik Paruchuri 9211a38374 Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui ...

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

2013-08-15 11:36:11 -04:00

..

test_files

Create a new response type for Numerical/Formula

2013-08-12 11:48:45 -04:00

xmodule

Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui

2013-08-15 11:36:11 -04:00

.coveragerc

perform a new merge from master, resolve conflicts

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

setup.py

Python: videoalpha -> video.

2013-08-12 14:31:48 +03:00