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

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

Merge upstream changes
---

4aec8087c71a623abdf201bbc2619507a6b02374