From: ThibG <thib@sitedethib.com>
Date: Wed, 22 Jul 2020 13:39:36 +0000 (+0200)
Subject: Merge pull request #1385 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=4024952b58bacb94d2cb43fafddf0e97bea4c55c;p=mastodon.git

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

Merge upstream changes
---

4024952b58bacb94d2cb43fafddf0e97bea4c55c