From: ThibG <thib@sitedethib.com>
Date: Fri, 22 Mar 2019 19:22:18 +0000 (+0100)
Subject: Merge pull request #965 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=9f56511860493b770c2e535be0f8ce4777c8d373;p=mastodon.git

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

Merge upstream changes
---

9f56511860493b770c2e535be0f8ce4777c8d373