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

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

Merge upstream changes
---

a2b4b82f0fdcae4757d169c706262926f4e53c6b