From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 17 Jan 2022 09:01:02 +0000 (+0100)
Subject: Merge pull request #1661 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=430d4427916b44e6a7c16db1899dfef2eec140fc;p=mastodon.git

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

Merge upstream changes
---

430d4427916b44e6a7c16db1899dfef2eec140fc