From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 16 Dec 2021 18:45:17 +0000 (+0100)
Subject: Merge pull request #1648 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=7efef7db9ed6f7b25a28166c1b75a28adbaf7cdb;p=mastodon.git

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

Merge upstream changes
---

7efef7db9ed6f7b25a28166c1b75a28adbaf7cdb