From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 8 Sep 2021 12:16:17 +0000 (+0200)
Subject: Merge pull request #1597 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=e2921375c3dee8b9fec47b0267edcecef380bc42;p=mastodon.git

Merge pull request #1597 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
---

e2921375c3dee8b9fec47b0267edcecef380bc42