From: ThibG <thib@sitedethib.com>
Date: Thu, 7 Nov 2019 20:15:22 +0000 (+0100)
Subject: Merge pull request #1243 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=707c4918b21d19dd53b64120dbc7263f45fc5ecd;p=mastodon.git

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

Merge upstream changes
---

707c4918b21d19dd53b64120dbc7263f45fc5ecd