From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 19 Mar 2021 13:34:08 +0000 (+0100)
Subject: Merge pull request #1513 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=c7f04961b6dcb1b7e12136deadcf65076c130c40;p=mastodon.git

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

Merge upstream changes
---

c7f04961b6dcb1b7e12136deadcf65076c130c40