From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 2 Mar 2021 15:33:06 +0000 (+0100)
Subject: Merge pull request #1504 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=f4abf8e7829c6a5b952dea6fb9ad01b6b3601f95;p=mastodon.git

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

Merge upstream changes
---

f4abf8e7829c6a5b952dea6fb9ad01b6b3601f95