From: ThibG <thib@sitedethib.com>
Date: Fri, 19 Apr 2019 11:41:34 +0000 (+0200)
Subject: Merge pull request #998 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=8933e8cb1d54a6c96e4085e426481143d3e209e0;p=mastodon.git

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

Merge upstream changes
---

8933e8cb1d54a6c96e4085e426481143d3e209e0