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

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

Merge upstream changes
---

fa75324059c7a146354470691888dc0e1de0342f