From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 18 May 2021 07:57:30 +0000 (+0200)
Subject: Merge pull request #1541 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=03952c7d4980a008f6711d7f14b8808229d73524;p=mastodon.git

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

Merge upstream changes
---

03952c7d4980a008f6711d7f14b8808229d73524