From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 25 Oct 2021 19:31:10 +0000 (+0200)
Subject: Merge pull request #1625 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=e0f39626973fd9f5cce2d4cd3b166fb47e9c9059;p=mastodon.git

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

Merge upstream changes
---

e0f39626973fd9f5cce2d4cd3b166fb47e9c9059