From: Claire <claire.github-309c@sitedethib.com>
Date: Sun, 11 Jul 2021 20:38:06 +0000 (+0200)
Subject: Merge pull request #1563 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=0c6dfcf3de83ef9595b95c5d2d6fc116fe319861;p=mastodon.git

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

Merge upstream changes
---

0c6dfcf3de83ef9595b95c5d2d6fc116fe319861