From: ThibG <thib@sitedethib.com>
Date: Thu, 11 Apr 2019 13:14:31 +0000 (+0200)
Subject: Merge pull request #987 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=bb50ec2e6687238ad8b2ec545a73270fee7a7b09;p=mastodon.git

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

Merge upstream changes
---

bb50ec2e6687238ad8b2ec545a73270fee7a7b09