From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 26 Nov 2021 00:25:29 +0000 (+0100)
Subject: Merge pull request #1637 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=025a2ceb0f31b4672479418ba0ae784cdfe3b0c6;p=mastodon.git

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

Merge upstream changes
---

025a2ceb0f31b4672479418ba0ae784cdfe3b0c6