From: ThibG <thib@sitedethib.com>
Date: Sun, 27 Jan 2019 21:24:29 +0000 (+0100)
Subject: Merge pull request #900 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=e488faaa4ae18f33023b4661eeed0d7643cb9d9c;p=mastodon.git

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

Merge upstream changes
---

e488faaa4ae18f33023b4661eeed0d7643cb9d9c