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

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

Merge upstream changes
---

6f78c66fe01921a4e7e01aa6e2386a5fce7f3afd