Merge branch 'ffmpeg' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Sun, 30 May 2021 17:42:48 +0000 (17:42 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Sun, 30 May 2021 17:42:48 +0000 (17:42 +0000)
commit4a58cb469bf2732c3d8dce06764fcd9232367c2c
tree890552db0f1934794404a56895c0697e3bedeeef
parent5d40ffe429caa21eab33951457bb314677753866
parent0204ceff7f66cffd87f06926ad856742940e02ff
Merge branch 'ffmpeg' into 'develop'

Add ffmpeg to docker image

See merge request pleroma/pleroma!3428