From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 1 Feb 2022 20:41:58 +0000 (+0100)
Subject: Merge pull request #1675 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=20a4b8081f419195334faee1b066e7e609ad4ffe;p=mastodon.git

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

Merge upstream changes
---

20a4b8081f419195334faee1b066e7e609ad4ffe