From: ThibG <thib@sitedethib.com>
Date: Sat, 30 Mar 2019 23:37:16 +0000 (+0100)
Subject: Merge pull request #976 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=925830d11bb5c132e282f82bdb2ca893d87c9c24;p=mastodon.git

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

Merge upstream changes
---

925830d11bb5c132e282f82bdb2ca893d87c9c24