From: ThibG <thib@sitedethib.com>
Date: Sat, 26 Jan 2019 17:47:48 +0000 (+0100)
Subject: Merge pull request #897 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=64cb9b691310a8b955e23b57ed0af51686f3ceb4;p=mastodon.git

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

Merge upstream changes
---

64cb9b691310a8b955e23b57ed0af51686f3ceb4