From: ThibG <thib@sitedethib.com>
Date: Tue, 4 Jun 2019 15:12:25 +0000 (+0200)
Subject: Merge pull request #1079 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=58946fef3c05342289c1c50132996fc4fd01cf68;p=mastodon.git

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

Merge upstream changes
---

58946fef3c05342289c1c50132996fc4fd01cf68