From: ThibG <thib@sitedethib.com>
Date: Sat, 11 May 2019 20:05:39 +0000 (+0200)
Subject: Merge pull request #1044 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=f6838a28f64a2e1a955d7062d8b4270312df802f;p=mastodon.git

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

Merge upstream changes
---

f6838a28f64a2e1a955d7062d8b4270312df802f