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

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

Merge upstream changes
---

ba22398c38067e05f141a0dddeb20bf68913988a