From: Claire <claire.github-309c@sitedethib.com>
Date: Sun, 25 Jul 2021 12:31:49 +0000 (+0200)
Subject: Merge pull request #1570 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=359f8de2e8297670fe9faf0839c8c9dd25b58de1;p=mastodon.git

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

Merge upstream changes
---

359f8de2e8297670fe9faf0839c8c9dd25b58de1