From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 19 Nov 2021 18:55:02 +0000 (+0100)
Subject: Merge pull request #1634 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=3ba7c85ec9bd5dcf75b30b00ed634b3b31a029af;p=mastodon.git

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

Merge upstream changes
---

3ba7c85ec9bd5dcf75b30b00ed634b3b31a029af