From: ThibG <thib@sitedethib.com>
Date: Mon, 5 Aug 2019 15:58:39 +0000 (+0200)
Subject: Merge pull request #1187 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=0aee74d78a801285ac33647791da9cb1ede9ddf4;p=mastodon.git

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

Merge upstream changes
---

0aee74d78a801285ac33647791da9cb1ede9ddf4