From: lain <lain@soykaf.club>
Date: Tue, 29 Sep 2020 14:48:30 +0000 (+0000)
Subject: Merge branch 'ffmpeg-imagemagick-dependencies-documentation' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=2a11068a11caa33bbd3fc66f175c5511f8ab2eaf;p=akkoma

Merge branch 'ffmpeg-imagemagick-dependencies-documentation' into 'develop'

`ffmpeg` / `ImageMagick` handling as optional dependencies

See merge request pleroma/pleroma!3031
---

2a11068a11caa33bbd3fc66f175c5511f8ab2eaf