From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 10 Mar 2022 16:29:15 +0000 (+0100)
Subject: Merge pull request #1715 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=2c8bb1745359a3bf200d37383dc56d5951e2b6bc;p=mastodon.git

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

Merge upstream changes
---

2c8bb1745359a3bf200d37383dc56d5951e2b6bc