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

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

Merge upstream changes
---

f03148f441d8dfc1856451c4faa00b5e26b6e199