From: ThibG <thib@sitedethib.com>
Date: Fri, 8 Mar 2019 19:43:51 +0000 (+0100)
Subject: Merge pull request #947 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=42cc93e8923a1b6cdb61574e9a86e360cba56abb;p=mastodon.git

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

Merge upstream changes
---

42cc93e8923a1b6cdb61574e9a86e360cba56abb