From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 13 Jul 2021 21:55:09 +0000 (+0200)
Subject: Merge pull request #1567 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=e42ed4502f9e4a599ecf7a860b7de80090ba46ad;p=mastodon.git

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

Merge upstream changes
---

e42ed4502f9e4a599ecf7a860b7de80090ba46ad