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

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

Merge upstream changes
---

23a548d794b1cb5005428c6bcf73819c1944339e