From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 1 Mar 2022 09:34:33 +0000 (+0100)
Subject: Merge pull request #1708 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=0b8fe020b599341d78cc03431eb156485c70ebea;p=mastodon.git

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

Merge upstream changes
---

0b8fe020b599341d78cc03431eb156485c70ebea