From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 23 Jun 2021 10:49:09 +0000 (+0200)
Subject: Merge pull request #1551 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=776e00f19399875a135a64d8ad486f3578101cf9;p=mastodon.git

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

Merge upstream changes
---

776e00f19399875a135a64d8ad486f3578101cf9