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

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

Merge upstream changes
---

e660a7bbb0877b1a05b64efe4d9e4a156f0b026e