From: ThibG <thib@sitedethib.com>
Date: Sun, 16 Jun 2019 19:25:37 +0000 (+0200)
Subject: Merge pull request #1121 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=118701b548556a8894ea94837d120c3374c5e3a6;p=mastodon.git

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

Merge upstream changes
---

118701b548556a8894ea94837d120c3374c5e3a6