From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 8 Mar 2022 21:40:21 +0000 (+0100)
Subject: Merge pull request #1713 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=02133866e6915e37431298b396e1aded1e4c44c5;p=mastodon.git

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

Merge upstream changes
---

02133866e6915e37431298b396e1aded1e4c44c5