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

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

Merge upstream changes
---

fc8baba8cb26cdcb74f00a4c51c8a88f1ee3e7ac