From: ThibG <thib@sitedethib.com>
Date: Thu, 23 May 2019 18:49:18 +0000 (+0200)
Subject: Merge pull request #1065 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=c394d3cb25ad39f169fbf45d18153a51d34c43ad;p=mastodon.git

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

Merge upstream changes
---

c394d3cb25ad39f169fbf45d18153a51d34c43ad