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

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

Merge upstream changes
---

db2f6fa49b1a704c66be3f0ea04a440cde80cf50