From: ThibG <thib@sitedethib.com>
Date: Wed, 6 Mar 2019 21:59:07 +0000 (+0100)
Subject: Merge pull request #942 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=da8ce25fa1c5f1ebd9c314c5a438b0e77f8d720c;p=mastodon.git

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

Merge upstream changes
---

da8ce25fa1c5f1ebd9c314c5a438b0e77f8d720c