From: ThibG <thib@sitedethib.com>
Date: Sun, 16 Dec 2018 14:26:50 +0000 (+0100)
Subject: Merge pull request #856 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=396c5dea87f259255f3676bb7b30f5cfdfec9d4e;p=mastodon.git

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

Merge upstream changes
---

396c5dea87f259255f3676bb7b30f5cfdfec9d4e