From: ThibG <thib@sitedethib.com>
Date: Fri, 7 Jun 2019 20:15:44 +0000 (+0200)
Subject: Merge pull request #1097 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=11c28abcfebcf8827f99a86540076347f1a1edff;p=mastodon.git

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

Merge upstream changes
---

11c28abcfebcf8827f99a86540076347f1a1edff