From: ThibG <thib@sitedethib.com>
Date: Thu, 28 Mar 2019 14:12:33 +0000 (+0100)
Subject: Merge pull request #970 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=bb316faffff7a76bc89f7e942233f0e14caf60f5;p=mastodon.git

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

Merge upstream changes
---

bb316faffff7a76bc89f7e942233f0e14caf60f5