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

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

Merge upstream changes
---

fce885f271f8651702d606406e21677280071e40