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

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

Merge upstream changes
---

97da7b73071e9f515c4bb0bca72c88d1a13b14aa