Adam Palay 8243d934e4 Merge remote-tracking branch 'origin/release' into merge-release-to-master ...

Conflicts:
	common/test/acceptance/tests/video/test_video_times.py

2015-05-08 10:23:04 -04:00

..

test_files

Integrate js-test-tool into testing infrastructure

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

xmodule

Merge remote-tracking branch 'origin/release' into merge-release-to-master

2015-05-08 10:23:04 -04:00

.coveragerc

Clean up coverage counting a little bit

2014-09-29 22:35:41 -04:00

setup.py

Convert VerticalModule/VerticalDescriptor to a pure XBlock: VerticalBlock

2015-03-31 09:43:52 -04:00