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

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

Merge upstream changes
---

df82963ea4fda69571ae27abef4239d4b755eb2f