From: feld <feld@feld.me>
Date: Fri, 20 Nov 2020 21:40:23 +0000 (+0000)
Subject: Merge branch 'cherry-pick-8a7ee9fe' into 'stable'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=9fc3356a06158c21c7e113552de4bcf2a6426df7;p=akkoma

Merge branch 'cherry-pick-8a7ee9fe' into 'stable'

Merge branch 'revert-da4660d2' into 'stable'

See merge request pleroma/pleroma!3166
---

9fc3356a06158c21c7e113552de4bcf2a6426df7