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

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

Merge upstream changes
---

ab9082b3325dfd193d7130d6c880e85ab2781bc0