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

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

Merge upstream changes
---

c8ef003c6b40e9b7212f43f1b5706b0967fcfe8a