From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 2 Mar 2022 18:11:17 +0000 (+0100)
Subject: Merge pull request #1709 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=d9e30efa5ecc87bc9be7b2e28baaf34bd01032f5;p=mastodon.git

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

Merge upstream changes
---

d9e30efa5ecc87bc9be7b2e28baaf34bd01032f5