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

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

Merge upstream changes
---

bbc9ca5d38c342f3afa87835f86cdbe82a9affdb