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

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

Merge upstream changes
---

e58e0eb9aa375b1107b207e8229a2142c4edc0b8