Merge remote-tracking branch 'origin/pr/1785' into develop
authorChocobozzz <me@florianbigard.com>
Thu, 16 May 2019 06:58:39 +0000 (08:58 +0200)
committerChocobozzz <me@florianbigard.com>
Thu, 16 May 2019 06:58:39 +0000 (08:58 +0200)
commit1600235a2f4e30c5d4e7d4342d1c299845decc60
tree8d170d3133a978526474532fc33ac4ba4878f632
parentbec4ea343987c69252b84d02f444c0f033d4a3f9
parent658a47ab6812586537c3db8a5a003e287c47beb7
Merge remote-tracking branch 'origin/pr/1785' into develop
server/helpers/ffmpeg-utils.ts
server/tests/api/videos/video-transcoder.ts