From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 14 Mar 2022 16:34:30 +0000 (+0100)
Subject: Merge pull request #1717 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=76d6fe63c3a4a68bb26eb8eeea35e52207e35cbc;p=mastodon.git

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

Merge upstream changes
---

76d6fe63c3a4a68bb26eb8eeea35e52207e35cbc