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

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

Merge upstream changes
---

00889b313176308018d66e54b5cb7dcc92da1587