From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 8 Apr 2022 20:24:07 +0000 (+0200)
Subject: Merge pull request #1737 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=c483101b4ae7d9f22ea43921c512f479e16e98ca;p=mastodon.git

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

Merge upstream changes
---

c483101b4ae7d9f22ea43921c512f479e16e98ca