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

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

Merge upstream changes
---

567745c1e66593ef46a86dc0bcfe824cefb04f14