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

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

Merge upstream changes
---

a627e59116507eab6be07b3b3a49bfe4ca77385a