From: ThibG <thib@sitedethib.com>
Date: Thu, 22 Oct 2020 20:38:11 +0000 (+0200)
Subject: Merge pull request #1441 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=36e5c9d45be0e94216b5b92ea8749a00bb68e0e3;p=mastodon.git

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

Merge upstream changes
---

36e5c9d45be0e94216b5b92ea8749a00bb68e0e3