From: ThibG <thib@sitedethib.com>
Date: Sun, 20 Jan 2019 12:56:37 +0000 (+0100)
Subject: Merge pull request #888 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=aa362ab73dc7121104b3c01800152b9fc56ea396;p=mastodon.git

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

Merge upstream changes
---

aa362ab73dc7121104b3c01800152b9fc56ea396