From: ThibG <thib@sitedethib.com>
Date: Sun, 22 Mar 2020 16:59:47 +0000 (+0100)
Subject: Merge pull request #1305 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=d101438b9d1bd827c191605cb21d58f83de2124d;p=mastodon.git

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

Merge upstream changes
---

d101438b9d1bd827c191605cb21d58f83de2124d