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

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

Merge upstream changes
---

b209e919bddb4bb72bb4f8589f4b15654f22ef53