From: ThibG <thib@sitedethib.com>
Date: Mon, 26 Oct 2020 15:11:58 +0000 (+0100)
Subject: Merge pull request #1442 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=9c88792f0a60f2b383f0d3919475403e1e244faf;p=mastodon.git

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

Merge upstream changes
---

9c88792f0a60f2b383f0d3919475403e1e244faf