From: Claire <claire.github-309c@sitedethib.com>
Date: Sat, 26 Feb 2022 20:23:55 +0000 (+0100)
Subject: Merge pull request #1707 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=df60524b309f3eb5c7997cf6cbd609ca6e74db29;p=mastodon.git

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

Merge upstream changes
---

df60524b309f3eb5c7997cf6cbd609ca6e74db29