From: ThibG <thib@sitedethib.com>
Date: Sun, 19 May 2019 19:52:27 +0000 (+0200)
Subject: Merge pull request #1054 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=46811f92e4b1705da5bb52e0e9e4e9e59ea1a15e;p=mastodon.git

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

Merge upstream changes
---

46811f92e4b1705da5bb52e0e9e4e9e59ea1a15e