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

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

Merge upstream changes
---

73b730e649555c9b0d2419130c5496e715fd3387