From: ThibG <thib@sitedethib.com>
Date: Tue, 26 Jan 2021 22:21:32 +0000 (+0100)
Subject: Merge pull request #1491 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=52ff3ca675ecac0ff32990b6321fb5e349e6dc59;p=mastodon.git

Merge pull request #1491 from ThibG/glitch-soc/merge-upstream

Merge upstream changes
---

52ff3ca675ecac0ff32990b6321fb5e349e6dc59