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

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

Merge upstream changes
---

e48eaf64cc7cb0cfab388331c4823ee5fb580d59