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

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

Merge upstream changes
---

a2a85d5ae03282c6f9cbf452b9b8f7d948a9f380