From: ThibG <thib@sitedethib.com>
Date: Mon, 18 Mar 2019 18:54:23 +0000 (+0100)
Subject: Merge pull request #963 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=b9a998f201913dd1c89ddcb0c4c9e181eb73bfcf;p=mastodon.git

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

Merge upstream changes
---

b9a998f201913dd1c89ddcb0c4c9e181eb73bfcf