From: Claire <claire.github-309c@sitedethib.com>
Date: Sat, 26 Feb 2022 20:15:19 +0000 (+0100)
Subject: Merge pull request #1704 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=551820cbd9e5beebd16f16205143e2263d4f2d51;p=mastodon.git

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

Merge upstream changes
---

551820cbd9e5beebd16f16205143e2263d4f2d51