From: ThibG <thib@sitedethib.com>
Date: Sat, 16 Mar 2019 21:59:47 +0000 (+0100)
Subject: Merge pull request #962 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=6e3a4bcbc70bb33bfb0746cf3b2186ee9f4e6515;p=mastodon.git

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

Merge upstream changes
---

6e3a4bcbc70bb33bfb0746cf3b2186ee9f4e6515