From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 29 Mar 2022 14:39:43 +0000 (+0200)
Subject: Merge pull request #1724 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=eaea849035ea407afb2d5db411dbddc1ccca6f44;p=mastodon.git

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

Merge upstream changes
---

eaea849035ea407afb2d5db411dbddc1ccca6f44