From: ThibG <thib@sitedethib.com>
Date: Mon, 10 Jun 2019 21:01:56 +0000 (+0200)
Subject: Merge pull request #1102 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=c64eef12069c3476f9956dfaaf6a3a9f91c14e2d;p=mastodon.git

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

Merge upstream changes
---

c64eef12069c3476f9956dfaaf6a3a9f91c14e2d