David Ormsbee 50c682e459 Merge pull request #583 from MITx/rocha/master ...

[#35065403] Lets video player work if subtitles cannot be loaded

2012-08-29 07:01:58 -07:00

..

test_files

Merge remote-tracking branch 'origin/master' into dormsbee/multicourse

2012-07-05 16:22:50 -04:00

xmodule

Merge pull request #583 from MITx/rocha/master

2012-08-29 07:01:58 -07:00

setup.py

Merge branch 'master' of github.com:MITx/mitx into profile

2012-08-18 16:57:00 -07:00