From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 4 Apr 2022 16:42:43 +0000 (+0200)
Subject: Merge pull request #1731 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=393db67ecc4c272204f2331b64d7456d69835b15;p=mastodon.git

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

Merge upstream changes
---

393db67ecc4c272204f2331b64d7456d69835b15