From: lain <lain@soykaf.club>
Date: Tue, 14 Jan 2020 17:48:58 +0000 (+0000)
Subject: Merge branch 'features/docker-updates' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=b4532277b1448b9108585bfdc2fc61918fc4fb6c;p=akkoma

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

Features/docker updates

See merge request pleroma/pleroma!2104
---

b4532277b1448b9108585bfdc2fc61918fc4fb6c