From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 30 Jun 2021 09:13:38 +0000 (+0200)
Subject: Merge pull request #1559 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=f4b9d94ce78761eb93c34333cbce5730da9ea97f;p=mastodon.git

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

Merge upstream changes
---

f4b9d94ce78761eb93c34333cbce5730da9ea97f