From: ThibG <thib@sitedethib.com>
Date: Tue, 23 Jul 2019 15:21:55 +0000 (+0200)
Subject: Merge pull request #1174 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=08325db62bcc4d5d530513c615bc1c733f166239;p=mastodon.git

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

Merge upstream changes
---

08325db62bcc4d5d530513c615bc1c733f166239