From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 8 Sep 2021 11:24:54 +0000 (+0200)
Subject: Merge pull request #1594 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=127aaa81742d57a7cee782c7d7fa3ec83488fba5;p=mastodon.git

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

Merge upstream changes
---

127aaa81742d57a7cee782c7d7fa3ec83488fba5