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

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

Merge upstream changes
---

f61137b7ffb97006ab811f8a4bce017b5f07f85d