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

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

Merge upstream changes
---

ac300173f68d2497cccf4e5bf558d95fc6105c96