From: ThibG <thib@sitedethib.com>
Date: Sat, 20 Jul 2019 22:53:28 +0000 (+0200)
Subject: Merge pull request #1158 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=f1597e1ab90b1fb291f16977877c6ca79bf89676;p=mastodon.git

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

Merge upstream changes
---

f1597e1ab90b1fb291f16977877c6ca79bf89676