From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 3 Feb 2021 17:57:38 +0000 (+0100)
Subject: Merge pull request #1496 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=4ed9576cd28abc033a094fed6babe9825014f1af;p=mastodon.git

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

Merge upstream changes
---

4ed9576cd28abc033a094fed6babe9825014f1af