From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 13 Oct 2021 14:29:17 +0000 (+0200)
Subject: Merge pull request #1620 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=ebf2c3195615bb524f6908e84f99887c8775cbc3;p=mastodon.git

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

Merge upstream changes
---

ebf2c3195615bb524f6908e84f99887c8775cbc3