From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 23 Mar 2022 14:56:24 +0000 (+0100)
Subject: Merge pull request #1721 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=6f032076ed0f338d914d70aaa3333d4c00940c71;p=mastodon.git

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

Merge upstream changes
---

6f032076ed0f338d914d70aaa3333d4c00940c71