Merge branch 'ffmpeg-imagemagick-dependencies-documentation' into 'develop'
authorlain <lain@soykaf.club>
Tue, 29 Sep 2020 14:48:30 +0000 (14:48 +0000)
committerlain <lain@soykaf.club>
Tue, 29 Sep 2020 14:48:30 +0000 (14:48 +0000)
`ffmpeg` / `ImageMagick` handling as optional dependencies

See merge request pleroma/pleroma!3031

1  2 
CHANGELOG.md

diff --cc CHANGELOG.md
Simple merge