From: ThibG <thib@sitedethib.com>
Date: Fri, 28 Jun 2019 20:35:54 +0000 (+0200)
Subject: Merge pull request #1146 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=98c2d2aa46c2725b360907cf5537338ac6d052ed;p=mastodon.git

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

Merge upstream changes
---

98c2d2aa46c2725b360907cf5537338ac6d052ed