From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 31 Mar 2022 08:42:51 +0000 (+0200)
Subject: Merge pull request #1729 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=3381a0e6e050438680f38c97ac9332045b8d66f4;p=mastodon.git

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

Merge upstream changes
---

3381a0e6e050438680f38c97ac9332045b8d66f4