From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 24 Jun 2021 13:16:38 +0000 (+0200)
Subject: Merge pull request #1553 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=2a4e44a725db57b8b506de6b09926bd977d4c504;p=mastodon.git

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

Merge upstream changes
---

2a4e44a725db57b8b506de6b09926bd977d4c504