From: ThibG <thib@sitedethib.com>
Date: Thu, 6 Dec 2018 16:40:43 +0000 (+0100)
Subject: Merge pull request #848 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=e3682c9c1750e5e7e5d2f817e29f6760a18400ca;p=mastodon.git

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

Merge upstream changes
---

e3682c9c1750e5e7e5d2f817e29f6760a18400ca