Merge branch 'feature/configurable-pack-extensions' into 'develop'
authorkaniini <nenolod@gmail.com>
Wed, 26 Jun 2019 05:34:02 +0000 (05:34 +0000)
committerkaniini <nenolod@gmail.com>
Wed, 26 Jun 2019 05:34:02 +0000 (05:34 +0000)
Make default pack extensions configurable and default to png and gif

See merge request pleroma/pleroma!1338

1  2 
CHANGELOG.md
config/config.exs
docs/config.md

diff --cc CHANGELOG.md
Simple merge
Simple merge
diff --cc docs/config.md
Simple merge