From: ThibG <thib@sitedethib.com>
Date: Sun, 10 Mar 2019 19:43:54 +0000 (+0100)
Subject: Merge pull request #950 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=3cef04610cd809c7bd01adc00d34fb3d25261a16;p=mastodon.git

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

Merge upstream changes
---

3cef04610cd809c7bd01adc00d34fb3d25261a16