From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 10 Feb 2022 20:07:48 +0000 (+0100)
Subject: Merge pull request #1683 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=776e337b8d2aa66440bc4565617b5440ca781e1a;p=mastodon.git

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

Merge upstream changes
---

776e337b8d2aa66440bc4565617b5440ca781e1a