From: ThibG <thib@sitedethib.com>
Date: Thu, 23 May 2019 20:01:34 +0000 (+0200)
Subject: Merge pull request #1067 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=72bf354e979a9b8c14c41bf34c47060d5ff4d232;p=mastodon.git

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

Merge upstream changes
---

72bf354e979a9b8c14c41bf34c47060d5ff4d232