From: ThibG <thib@sitedethib.com>
Date: Mon, 7 Sep 2020 12:16:54 +0000 (+0200)
Subject: Merge pull request #1418 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=437d71bddf967573df3912ee5976f7c5a5a7b4c7;p=mastodon.git

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

Merge upstream changes
---

437d71bddf967573df3912ee5976f7c5a5a7b4c7