From: ThibG <thib@sitedethib.com>
Date: Thu, 30 May 2019 12:07:45 +0000 (+0200)
Subject: Merge pull request #1076 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=8ce2a0887540e66fce5b7b52df12126b05cd740f;p=mastodon.git

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

Merge upstream changes
---

8ce2a0887540e66fce5b7b52df12126b05cd740f