From: ThibG <thib@sitedethib.com>
Date: Sat, 25 Jan 2020 18:07:32 +0000 (+0100)
Subject: Merge pull request #1267 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=5bd752081fd72c9899780eaa4b8ce2bd277b1ff0;p=mastodon.git

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

Merge upstream changes
---

5bd752081fd72c9899780eaa4b8ce2bd277b1ff0