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

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

Merge upstream changes
---

8c9c05d57914236dc7104a67e84743e1ce36f7cc