From: ThibG <thib@sitedethib.com>
Date: Sun, 17 Feb 2019 15:00:24 +0000 (+0100)
Subject: Merge pull request #920 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=1aa87a1967b37e9f118b87ee643944798d3c90f4;p=mastodon.git

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

Merge upstream changes
---

1aa87a1967b37e9f118b87ee643944798d3c90f4