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

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

Merge upstream changes
---

c1befd3909359e4d964da74bde9931a8416d26a3