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

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

Merge upstream changes
---

bde9196b70299405ebe9b16500b7a3f65539b2c3