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

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

Merge upstream changes
---

a4c828f8e73672ee344ab234ef11b173d44e1fdb