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

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

Merge upstream changes
---

fbe1de114fca16d63ff651425f69eb534ba013e9