From: ThibG <thib@sitedethib.com>
Date: Sun, 5 Jan 2020 12:51:50 +0000 (+0100)
Subject: Merge pull request #1259 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=bcfd6e3bb48f6e0eb88f7f3a650832842ab69166;p=mastodon.git

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

Merge upstream changes
---

bcfd6e3bb48f6e0eb88f7f3a650832842ab69166