From: ThibG <thib@sitedethib.com>
Date: Sun, 1 Dec 2019 12:13:28 +0000 (+0100)
Subject: Merge pull request #1250 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=7d59e25fbd7a0209c11cbe6aac4400bbca4de82b;p=mastodon.git

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

Merge upstream changes
---

7d59e25fbd7a0209c11cbe6aac4400bbca4de82b