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

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

Merge upstream changes
---

e0d94323bc8f6c5d249452e2baf1f103c15546b8