From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 11 Feb 2022 21:22:25 +0000 (+0100)
Subject: Merge pull request #1684 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=59b7ba451b4ded817c98abfa8c88738de0484917;p=mastodon.git

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

Merge upstream changes
---

59b7ba451b4ded817c98abfa8c88738de0484917