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

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

Merge upstream changes
---

a25839340e93b1e93b7b99b0f65fa7da7d62bad2