Merge branch 'transcoding_progress'

This probably broke stuff
This commit is contained in:
Boris Bobrov
2018-07-12 18:49:35 +02:00
24 changed files with 576 additions and 80 deletions

1
.gitignore vendored
View File

@@ -64,3 +64,4 @@ venv*
/extlib/leaflet/
/extlib/tinymce/
/extlib/video.js/
/extlib/videojs-resolution-switcher