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

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

Merge upstream changes
---

b1983623aec8e0b066d115736d2151e0c74407fa