From: ThibG <thib@sitedethib.com>
Date: Wed, 24 Apr 2019 17:42:33 +0000 (+0200)
Subject: Merge pull request #1007 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=9add18604c46e26bb38f72d88daaeb571288027c;p=mastodon.git

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

Merge upstream changes
---

9add18604c46e26bb38f72d88daaeb571288027c