Christina Roberts cd7f1d92a1 Merge pull request #2299 from lduarte1991/master ...

Text and Video Annotation Modules - First Iteration

2014-01-27 11:18:32 -08:00

..

test_files

Integrate js-test-tool into testing infrastructure

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

xmodule

Merge pull request #2299 from lduarte1991/master

2014-01-27 11:18:32 -08:00

.coveragerc

perform a new merge from master, resolve conflicts

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

setup.py

annotation tools

2014-01-27 13:47:58 -05:00