From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 28 Jan 2022 08:38:44 +0000 (+0100)
Subject: Merge pull request #1668 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=2ba6267f1603cee682bfe3885b797ad5df7e958f;p=mastodon.git

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

Merge upstream changes
---

2ba6267f1603cee682bfe3885b797ad5df7e958f