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

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

Merge upstream changes
---

d6f3261c6cb810ea4eb6f74b9ee62af0d94cbd52