From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 22 Feb 2022 18:53:36 +0000 (+0100)
Subject: Merge pull request #1699 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=2c8615fbf8f8085eb836733b27b33c9522c29c71;p=mastodon.git

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

Merge upstream changes
---

2c8615fbf8f8085eb836733b27b33c9522c29c71