Calen Pennington 2a4b3c969a Fix merge conflicts

2014-05-15 10:25:20 -04:00

..

__init__.py

BLD-642: Allow multiple transcripts with video.

2014-02-24 21:57:08 +02:00

transcripts_utils.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-08 20:28:53 -04:00

video_handlers.py

Fix merge conflicts

2014-05-15 10:25:20 -04:00

video_module.py

Update Video component UI text

2014-05-09 12:37:28 -04:00

video_utils.py

BLD-642: Allow multiple transcripts with video.

2014-02-24 21:57:08 +02:00

video_xfields.py

Fix failing tests from merge with master

2014-05-12 11:34:39 -04:00