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

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

Merge upstream changes
---

35469b1952c03ba8192bd28fc9cbc39cdcca9f4c