From: ThibG <thib@sitedethib.com>
Date: Wed, 2 Jan 2019 19:03:32 +0000 (+0100)
Subject: Merge pull request #878 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=0acd51acdc1e670bf57f58671cb8e30743782c63;p=mastodon.git

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

Merge upstream changes
---

0acd51acdc1e670bf57f58671cb8e30743782c63