From: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date: Sun, 30 May 2021 17:42:48 +0000 (+0000)
Subject: Merge branch 'ffmpeg' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;ds=sidebyside;h=4a58cb469bf2732c3d8dce06764fcd9232367c2c;p=akkoma

Merge branch 'ffmpeg' into 'develop'

Add ffmpeg to docker image

See merge request pleroma/pleroma!3428
---

4a58cb469bf2732c3d8dce06764fcd9232367c2c