From: feld <feld@feld.me>
Date: Tue, 14 Jan 2020 21:36:52 +0000 (+0000)
Subject: Merge branch 'features/docker-updates' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=77412d5dd24a384f9be7d6bc6b1538415c584802;p=akkoma

Merge branch 'features/docker-updates' into 'develop'

Features/docker updates

See merge request pleroma/pleroma!2105
---

77412d5dd24a384f9be7d6bc6b1538415c584802