From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 30 Mar 2022 13:02:16 +0000 (+0200)
Subject: Merge pull request #1725 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=60f9973f452100475874cd9bd0a8b6ee908bf8e0;p=mastodon.git

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

Merge upstream changes
---

60f9973f452100475874cd9bd0a8b6ee908bf8e0