From: ThibG <thib@sitedethib.com>
Date: Wed, 5 Jun 2019 11:28:05 +0000 (+0200)
Subject: Merge pull request #1093 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=ff74aaca7cd532065f24829a3ac16de809bacf3f;p=mastodon.git

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

Merge upstream changes
---

ff74aaca7cd532065f24829a3ac16de809bacf3f