From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 6 Oct 2021 16:02:18 +0000 (+0200)
Subject: Merge pull request #1616 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=44fd66f0c6bff9cd94ba55345640c913cd733948;p=mastodon.git

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

Merge upstream changes
---

44fd66f0c6bff9cd94ba55345640c913cd733948