From: ThibG <thib@sitedethib.com>
Date: Wed, 18 Sep 2019 22:22:39 +0000 (+0200)
Subject: Merge pull request #1221 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=febcdad2e2c98aee62b55ee21bdf0debf7c6fd6b;p=mastodon.git

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

Merge upstream changes
---

febcdad2e2c98aee62b55ee21bdf0debf7c6fd6b