From: ThibG <thib@sitedethib.com>
Date: Wed, 13 Mar 2019 15:55:07 +0000 (+0100)
Subject: Merge pull request #957 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=3005e473a0df4d2ea942dcc33e01c5e4c15b81fa;p=mastodon.git

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

Merge upstream changes
---

3005e473a0df4d2ea942dcc33e01c5e4c15b81fa