From: ThibG <thib@sitedethib.com>
Date: Tue, 5 Mar 2019 21:20:58 +0000 (+0100)
Subject: Merge pull request #935 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=772b4ba24c60e0394d25d0fad4eefb338a9befea;p=mastodon.git

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

Merge upstream changes
---

772b4ba24c60e0394d25d0fad4eefb338a9befea