From: ThibG <thib@sitedethib.com>
Date: Wed, 16 Jan 2019 15:28:38 +0000 (+0100)
Subject: Merge pull request #887 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=530d29148ca0c5bf29f6fa516b1ef4f91d95894b;p=mastodon.git

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

Merge upstream changes
---

530d29148ca0c5bf29f6fa516b1ef4f91d95894b