From: Claire <claire.github-309c@sitedethib.com>
Date: Sat, 12 Mar 2022 19:54:13 +0000 (+0100)
Subject: Merge pull request #1716 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=988f5bf0266483659b03f1b0926d0b9ff9e85a8f;p=mastodon.git

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

Merge upstream changes
---

988f5bf0266483659b03f1b0926d0b9ff9e85a8f