From: ThibG <thib@sitedethib.com>
Date: Sat, 31 Aug 2019 17:44:47 +0000 (+0200)
Subject: Merge pull request #1209 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=147e90f35d9aadfbe15d044f3ce48be77e26968a;p=mastodon.git

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

Merge upstream changes
---

147e90f35d9aadfbe15d044f3ce48be77e26968a