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

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

Merge upstream changes
---

48d00ac0d9ad703fa3605337b0866c8ce6f21b28