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

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

Merge upstream changes
---

c2857c976c7d4a8bbd02c3c18569913f2bf8a034