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

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

Merge upstream changes
---

363773d0e9ffa9f4efc564603327f225193a2bf1