Christine Lytwynec 96e5139d66 Merge branch 'release' ...

Conflicts:
	common/lib/xmodule/xmodule/tests/test_video.py

2014-06-25 13:51:31 -04:00

..

test_files

Integrate js-test-tool into testing infrastructure

2013-08-26 20:21:18 -04:00

xmodule

Merge branch 'release'

2014-06-25 13:51:31 -04:00

.coveragerc

…

setup.py

Move to OpaqueKey implementations from the external library

2014-05-29 17:03:35 -04:00