From: ThibG <thib@sitedethib.com>
Date: Thu, 2 Jul 2020 14:36:21 +0000 (+0200)
Subject: Merge pull request #1370 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=e62d574ead8a18050225532619f36423cf017371;p=mastodon.git

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

Merge upstream changes
---

e62d574ead8a18050225532619f36423cf017371