From: ThibG <thib@sitedethib.com>
Date: Mon, 13 Jan 2020 15:07:40 +0000 (+0100)
Subject: Merge pull request #1263 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=ddcf78d8d3e2a8cb9aa04f8ff42f9d8e185b0354;p=mastodon.git

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

Merge upstream changes
---

ddcf78d8d3e2a8cb9aa04f8ff42f9d8e185b0354