ichuang 0d938d3940 Merge branch 'master' of github.com:edx/edx-platform into feature/ichuang/import-with-no-static ...

Conflicts:
	lms/djangoapps/courseware/tests/test_module_render.py

2013-08-20 23:40:09 -04:00

..

test_files

Create a new response type for Numerical/Formula

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

xmodule

Merge branch 'master' of github.com:edx/edx-platform into feature/ichuang/import-with-no-static

2013-08-20 23:40:09 -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