From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 31 May 2021 14:49:48 +0000 (+0200)
Subject: Merge pull request #1546 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=02dffa8edd097014578774aed30249ed08d2f3a4;p=mastodon.git

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

Merge upstream changes
---

02dffa8edd097014578774aed30249ed08d2f3a4