From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 22 Feb 2021 18:36:03 +0000 (+0100)
Subject: Merge pull request #1501 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=4aa860b65bd796b09dc0ceffa1fdd7de31060a34;p=mastodon.git

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

Merge upstream changes
---

4aa860b65bd796b09dc0ceffa1fdd7de31060a34