From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 22 Sep 2021 15:27:15 +0000 (+0200)
Subject: Merge pull request #1606 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=4b7e43602691193b5d2a8e7e0ed6044bc8ee9774;p=mastodon.git

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

Merge upstream changes
---

4b7e43602691193b5d2a8e7e0ed6044bc8ee9774