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

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

Merge upstream changes
---

2fd1db7c9d0fe8c1cca159b9b0818c72e7c318aa