From: ThibG <thib@sitedethib.com>
Date: Thu, 13 Jun 2019 21:53:21 +0000 (+0200)
Subject: Merge pull request #1111 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=c0e5f32d13dfd696728dc1fa2ad9a93a27aa405f;p=mastodon.git

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

Merge upstream changes
---

c0e5f32d13dfd696728dc1fa2ad9a93a27aa405f