From: ThibG <thib@sitedethib.com>
Date: Sat, 28 Dec 2019 18:10:27 +0000 (+0100)
Subject: Merge pull request #1257 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=22daf24600d8e99e4569740ee5836d25c70c1e8b;p=mastodon.git

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

Merge upstream changes
---

22daf24600d8e99e4569740ee5836d25c70c1e8b