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

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

Merge upstream changes
---

d602c92b310545eb733a58caed49717341abe27c