From: ThibG <thib@sitedethib.com>
Date: Thu, 28 May 2020 12:53:36 +0000 (+0200)
Subject: Merge pull request #1337 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=39aa6301eb874963f214215d27f9ef5874c4d236;p=mastodon.git

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

Merge upstream changes
---

39aa6301eb874963f214215d27f9ef5874c4d236