From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 11 Mar 2021 17:04:18 +0000 (+0100)
Subject: Merge pull request #1510 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=935e376078fa8716ea5475a45602301fd3d6b081;p=mastodon.git

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

Merge upstream changes
---

935e376078fa8716ea5475a45602301fd3d6b081