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

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

Merge upstream changes
---

b4f785c1f46693c4e42b035e6728f99aac1b85db