From: ThibG <thib@sitedethib.com>
Date: Mon, 29 Jul 2019 21:37:14 +0000 (+0200)
Subject: Merge pull request #1179 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=f48c7689d230b915ed740a4774736bd5998cbc66;p=mastodon.git

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

Merge upstream changes
---

f48c7689d230b915ed740a4774736bd5998cbc66