From: Claire <claire.github-309c@sitedethib.com>
Date: Sat, 13 Nov 2021 09:41:25 +0000 (+0100)
Subject: Merge pull request #1632 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=f2b376e9d82577dc630757a2b927d02f8bfcf4b0;p=mastodon.git

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

Merge upstream changes
---

f2b376e9d82577dc630757a2b927d02f8bfcf4b0