From: ThibG <thib@sitedethib.com>
Date: Sat, 18 May 2019 08:18:52 +0000 (+0200)
Subject: Merge pull request #1053 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=4beb8d77889e4e152a483e4d17724fa83e7c0dd3;p=mastodon.git

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

Merge upstream changes
---

4beb8d77889e4e152a483e4d17724fa83e7c0dd3