From: ThibG <thib@sitedethib.com>
Date: Mon, 14 Jan 2019 10:48:36 +0000 (+0100)
Subject: Merge pull request #886 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=077639c27409f897e87522dd18a51801b6cbc40d;p=mastodon.git

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

Merge upstream changes
---

077639c27409f897e87522dd18a51801b6cbc40d