From: ThibG <thib@sitedethib.com>
Date: Mon, 1 Apr 2019 19:36:36 +0000 (+0200)
Subject: Merge pull request #978 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=3f5acc1ab3bc9c5a6c5805901a393ccd3457b909;p=mastodon.git

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

Merge upstream changes
---

3f5acc1ab3bc9c5a6c5805901a393ccd3457b909