From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 11 Aug 2021 15:25:06 +0000 (+0200)
Subject: Merge pull request #1585 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=4a364de500029676b9828ec596ed6c2a09cfb65c;p=mastodon.git

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

Merge upstream changes
---

4a364de500029676b9828ec596ed6c2a09cfb65c