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

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

Merge upstream changes
---

b54e263712a9f2b3d4ff0d7b692565d8e24dc03b