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

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

Merge upstream changes
---

8c2fe2a846dd14914f7faa4bf71be21058249a93