Merge branch 'transcoding_progress'
authorBoris Bobrov <breton@cynicmansion.ru>
Thu, 12 Jul 2018 16:49:35 +0000 (18:49 +0200)
committerBoris Bobrov <breton@cynicmansion.ru>
Thu, 12 Jul 2018 16:49:35 +0000 (18:49 +0200)
commit23af1d8cbc188c85d9f6ee9274af5b0102c48d24
tree0135ecc29f3322cc7ef24a033e1150f4eebd0f5b
parent8e5b7f633910de7e1429f02f0661fcbe311600fb
parent4551a808beb8aa0dab3f1a331d022bfa84ee933c
Merge branch 'transcoding_progress'

This probably broke stuff
.gitignore
mediagoblin/db/models.py
mediagoblin/media_types/video/processing.py
mediagoblin/templates/mediagoblin/media_displays/video.html
mediagoblin/user_pages/views.py