From: ThibG <thib@sitedethib.com>
Date: Thu, 19 Dec 2019 15:07:21 +0000 (+0100)
Subject: Merge pull request #1255 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=f064cd4fb8057af04f0f1db6a98fc45935811e25;p=mastodon.git

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

Merge upstream changes
---

f064cd4fb8057af04f0f1db6a98fc45935811e25