From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 7 Jan 2022 21:43:28 +0000 (+0100)
Subject: Merge pull request #1655 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=5b185b05f10f280bb2059920dfdb2b7f3d6f7d91;p=mastodon.git

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

Merge upstream changes
---

5b185b05f10f280bb2059920dfdb2b7f3d6f7d91