Will Daly 96c2a50370 Merge branch 'master' into will/use-mixed-modulestore-in-tests ...

Conflicts:
	common/lib/xmodule/xmodule/modulestore/django.py
	lms/djangoapps/courseware/tests/test_views.py
	lms/djangoapps/courseware/tests/tests.py

2013-08-21 10:12:24 -04:00

..

test_files

Create a new response type for Numerical/Formula

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

xmodule

Merge branch 'master' into will/use-mixed-modulestore-in-tests

2013-08-21 10:12:24 -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