From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 8 Jul 2021 17:53:43 +0000 (+0200)
Subject: Merge pull request #1562 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=f040b9aee3f84cb3ba8926fed81d47df3f1094a7;p=mastodon.git

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

Merge upstream changes
---

f040b9aee3f84cb3ba8926fed81d47df3f1094a7