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

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

Merge upstream changes
---

fefacb7b7a21fc4aa40cb18ac797ecb5c44627f6