From: Claire <claire.github-309c@sitedethib.com>
Date: Sun, 16 Jan 2022 21:39:35 +0000 (+0100)
Subject: Merge pull request #1659 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=a85912b0d6d2ee68aa35794fbb51c5358768c092;p=mastodon.git

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

Merge upstream changes
---

a85912b0d6d2ee68aa35794fbb51c5358768c092