From: ThibG <thib@sitedethib.com>
Date: Mon, 3 Feb 2020 09:27:07 +0000 (+0100)
Subject: Merge pull request #1274 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=94cdbc4982bde9709a633d26ff9a083dd9661258;p=mastodon.git

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

Merge upstream changes
---

94cdbc4982bde9709a633d26ff9a083dd9661258