From: ThibG <thib@sitedethib.com>
Date: Fri, 11 Jan 2019 09:53:58 +0000 (+0100)
Subject: Merge pull request #885 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=2cfa55185a5fc7d93a160a4e9a4730aae6725b0f;p=mastodon.git

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

Merge upstream changes
---

2cfa55185a5fc7d93a160a4e9a4730aae6725b0f