From: ThibG <thib@sitedethib.com>
Date: Wed, 7 Aug 2019 18:04:22 +0000 (+0200)
Subject: Merge pull request #1193 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=86cfa2ea6cb94c9597b9fcda034c8b4d959c5e3e;p=mastodon.git

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

Merge upstream changes
---

86cfa2ea6cb94c9597b9fcda034c8b4d959c5e3e