diff options
| author | Boris Bobrov <breton@cynicmansion.ru> | 2018-07-12 18:49:35 +0200 |
|---|---|---|
| committer | Boris Bobrov <breton@cynicmansion.ru> | 2018-07-12 18:49:35 +0200 |
| commit | 23af1d8cbc188c85d9f6ee9274af5b0102c48d24 (patch) | |
| tree | 0135ecc29f3322cc7ef24a033e1150f4eebd0f5b /mediagoblin/static/extlib | |
| parent | 8e5b7f633910de7e1429f02f0661fcbe311600fb (diff) | |
| parent | 4551a808beb8aa0dab3f1a331d022bfa84ee933c (diff) | |
| download | mediagoblin-23af1d8cbc188c85d9f6ee9274af5b0102c48d24.tar.lz mediagoblin-23af1d8cbc188c85d9f6ee9274af5b0102c48d24.tar.xz mediagoblin-23af1d8cbc188c85d9f6ee9274af5b0102c48d24.zip | |
Merge branch 'transcoding_progress'
This probably broke stuff
Diffstat (limited to 'mediagoblin/static/extlib')
| l--------- | mediagoblin/static/extlib/video-js | 2 | ||||
| l--------- | mediagoblin/static/extlib/videojs-resolution-switcher | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mediagoblin/static/extlib/video-js b/mediagoblin/static/extlib/video-js index 58401be0..c13a7532 120000 --- a/mediagoblin/static/extlib/video-js +++ b/mediagoblin/static/extlib/video-js @@ -1 +1 @@ -../../../extlib/video.js/dist/video-js
\ No newline at end of file +../../../extlib/video.js/dist/
\ No newline at end of file diff --git a/mediagoblin/static/extlib/videojs-resolution-switcher b/mediagoblin/static/extlib/videojs-resolution-switcher new file mode 120000 index 00000000..ace672d9 --- /dev/null +++ b/mediagoblin/static/extlib/videojs-resolution-switcher @@ -0,0 +1 @@ +../../../extlib/videojs-resolution-switcher/lib/
\ No newline at end of file |