From: ThibG <thib@sitedethib.com>
Date: Wed, 19 Dec 2018 15:19:00 +0000 (+0100)
Subject: Merge pull request #865 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=aae088aaf0d5de542d917d11b7b2e86047645dd7;p=mastodon.git

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

Merge upstream changes
---

aae088aaf0d5de542d917d11b7b2e86047645dd7