From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 9 Aug 2021 22:25:33 +0000 (+0200)
Subject: Merge pull request #1583 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=70b7ac9ff32a713e71a7ba6408a379b601c6839f;p=mastodon.git

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

Merge upstream changes
---

70b7ac9ff32a713e71a7ba6408a379b601c6839f