From: ThibG <thib@sitedethib.com>
Date: Tue, 25 Feb 2020 17:05:52 +0000 (+0100)
Subject: Merge pull request #1289 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=9ee8e1add9f937a75c2514ca88958ff02cf5573c;p=mastodon.git

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

Merge upstream changes
---

9ee8e1add9f937a75c2514ca88958ff02cf5573c