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

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

Merge upstream changes
---

ffc3f8eebe134ca9b18af73aa29eaa1627082e40