From: ThibG <thib@sitedethib.com>
Date: Wed, 10 Apr 2019 20:33:41 +0000 (+0200)
Subject: Merge pull request #985 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=31e4fcb006c6ef2d8e1a4c765e897afa1cba1b5c;p=mastodon.git

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

Merge upstream changes
---

31e4fcb006c6ef2d8e1a4c765e897afa1cba1b5c