From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 18 Mar 2022 18:45:05 +0000 (+0100)
Subject: Merge pull request #1720 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=9ff119eecd1079e52a8a41d7b8d61520c4303c2f;p=mastodon.git

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

Merge upstream changes
---

9ff119eecd1079e52a8a41d7b8d61520c4303c2f