From: ThibG <thib@sitedethib.com>
Date: Mon, 27 Jan 2020 16:26:53 +0000 (+0100)
Subject: Merge pull request #1271 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=67b8af34b3df55ba74a53af731f275d0a4c6d9f8;p=mastodon.git

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

Merge upstream changes
---

67b8af34b3df55ba74a53af731f275d0a4c6d9f8