From: ThibG <thib@sitedethib.com>
Date: Mon, 30 Sep 2019 21:29:55 +0000 (+0200)
Subject: Merge pull request #1224 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=65db9df011a3e13efa79f4e56343aa69bdad7716;p=mastodon.git

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

Merge upstream changes
---

65db9df011a3e13efa79f4e56343aa69bdad7716