From: ThibG <thib@sitedethib.com>
Date: Mon, 28 Oct 2019 15:25:55 +0000 (+0100)
Subject: Merge pull request #1240 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=00793a86bc52e4cb37318e42ea4ceb37a896c727;p=mastodon.git

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

Merge upstream changes
---

00793a86bc52e4cb37318e42ea4ceb37a896c727