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

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

Merge upstream changes
---

c5751f8377ed966381445a4a5871711ef565c3ea