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

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

Merge upstream changes
---

00c9363f07081e0149533023992fba47dd905384