From: feld <feld@feld.me>
Date: Sat, 21 Nov 2020 18:29:26 +0000 (+0000)
Subject: Merge branch 'cherry-pick-a65fc78c' into 'stable'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=15550f7c4bf75401d0f18add0f847f640acc6627;p=akkoma

Merge branch 'cherry-pick-a65fc78c' into 'stable'

Dockerfile fixes for stable

See merge request pleroma/pleroma!3169
---

15550f7c4bf75401d0f18add0f847f640acc6627