From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 7 Apr 2022 13:03:31 +0000 (+0200)
Subject: Merge pull request #1734 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=3f9959a4b66c8d33a1de6dd13972327ff62f2cd3;p=mastodon.git

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

Merge upstream changes
---

3f9959a4b66c8d33a1de6dd13972327ff62f2cd3