From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 31 Mar 2021 11:25:15 +0000 (+0200)
Subject: Merge pull request #1517 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=b7ec2a900251410c65ba214b50c1657209285b07;p=mastodon.git

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

Merge upstream changes
---

b7ec2a900251410c65ba214b50c1657209285b07