From: ThibG <thib@sitedethib.com>
Date: Wed, 10 Jun 2020 10:12:14 +0000 (+0200)
Subject: Merge pull request #1356 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=0a5cf075cdddbbe40e79ebad8ee2b1abd62d3200;p=mastodon.git

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

Merge upstream changes
---

0a5cf075cdddbbe40e79ebad8ee2b1abd62d3200