From: ThibG <thib@sitedethib.com>
Date: Sat, 25 Jan 2020 11:23:47 +0000 (+0100)
Subject: Merge pull request #1266 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=340cb4a04c94f9403673d59e552be909fce25ece;p=mastodon.git

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

Merge upstream changes
---

340cb4a04c94f9403673d59e552be909fce25ece