From: ThibG <thib@sitedethib.com>
Date: Wed, 19 Feb 2020 23:52:50 +0000 (+0100)
Subject: Merge pull request #1287 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=668098303284b0aa0f1dcfddc280ed1b6fb435bb;p=mastodon.git

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

Merge upstream changes
---

668098303284b0aa0f1dcfddc280ed1b6fb435bb