From: Claire <claire.github-309c@sitedethib.com>
Date: Sat, 18 Dec 2021 12:17:37 +0000 (+0100)
Subject: Merge pull request #1650 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=3b9a6049adf3ee6844a81622c297dd893836f79d;p=mastodon.git

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

Merge upstream changes
---

3b9a6049adf3ee6844a81622c297dd893836f79d