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

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

Merge upstream changes
---

0eebade48cfd92acdc9ff52b5ae9650c1879ff7c