From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 27 Dec 2021 15:46:38 +0000 (+0100)
Subject: Merge pull request #1653 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=e2933854ac598c5ee7428a654a72cf4f4bd9afea;p=mastodon.git

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

Merge upstream changes
---

e2933854ac598c5ee7428a654a72cf4f4bd9afea