From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 6 Apr 2021 09:17:52 +0000 (+0200)
Subject: Merge pull request #1519 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=df326b8b5c0659edb2aca77690a892f228b0e099;p=mastodon.git

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

Merge upstream changes
---

df326b8b5c0659edb2aca77690a892f228b0e099