From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 2 Jul 2021 14:57:28 +0000 (+0200)
Subject: Merge pull request #1560 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=0c2eb949fc21ceecbd99a81e5ffe75517a1e64df;p=mastodon.git

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

Merge upstream changes
---

0c2eb949fc21ceecbd99a81e5ffe75517a1e64df