aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorBoris Bobrov <breton@cynicmansion.ru>2018-07-12 18:49:35 +0200
committerBoris Bobrov <breton@cynicmansion.ru>2018-07-12 18:49:35 +0200
commit23af1d8cbc188c85d9f6ee9274af5b0102c48d24 (patch)
tree0135ecc29f3322cc7ef24a033e1150f4eebd0f5b /.gitignore
parent8e5b7f633910de7e1429f02f0661fcbe311600fb (diff)
parent4551a808beb8aa0dab3f1a331d022bfa84ee933c (diff)
downloadmediagoblin-23af1d8cbc188c85d9f6ee9274af5b0102c48d24.tar.lz
mediagoblin-23af1d8cbc188c85d9f6ee9274af5b0102c48d24.tar.xz
mediagoblin-23af1d8cbc188c85d9f6ee9274af5b0102c48d24.zip
Merge branch 'transcoding_progress'
This probably broke stuff
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 4eb61d66..acb9a3b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,3 +64,4 @@ venv*
/extlib/leaflet/
/extlib/tinymce/
/extlib/video.js/
+/extlib/videojs-resolution-switcher