From: ThibG <thib@sitedethib.com>
Date: Mon, 9 Nov 2020 10:30:28 +0000 (+0100)
Subject: Merge pull request #1454 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=67125534bc0fd48a45d6cb17a5c78712d8e87150;p=mastodon.git

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

Merge upstream changes
---

67125534bc0fd48a45d6cb17a5c78712d8e87150