From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 2 Mar 2022 20:47:03 +0000 (+0100)
Subject: Merge pull request #1710 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=3637a0101e1f5095397f190e88f281d603797c32;p=mastodon.git

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

Merge upstream changes
---

3637a0101e1f5095397f190e88f281d603797c32