From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 7 Apr 2022 13:25:53 +0000 (+0200)
Subject: Merge pull request #1736 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=e0c39f9fad837b77373220515f078f2443ddf553;p=mastodon.git

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

Merge upstream changes
---

e0c39f9fad837b77373220515f078f2443ddf553