From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 14 Oct 2021 20:57:41 +0000 (+0200)
Subject: Merge pull request #1622 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=b6f24ef0fb8b594c38c29090518c21af051b63b7;p=mastodon.git

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

Merge upstream changes
---

b6f24ef0fb8b594c38c29090518c21af051b63b7