From: ThibG <thib@sitedethib.com>
Date: Thu, 6 Feb 2020 21:48:26 +0000 (+0100)
Subject: Merge pull request #1278 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=96ec90b986c8a2783135f123c10062725d274733;p=mastodon.git

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

Merge upstream changes
---

96ec90b986c8a2783135f123c10062725d274733