From: ThibG <thib@sitedethib.com>
Date: Wed, 27 Mar 2019 13:02:32 +0000 (+0100)
Subject: Merge pull request #968 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=7535c607f40cb31fbb68c8f416992c3c5fcc929d;p=mastodon.git

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

Merge upstream changes
---

7535c607f40cb31fbb68c8f416992c3c5fcc929d