From: ThibG <thib@sitedethib.com>
Date: Thu, 28 Feb 2019 21:02:36 +0000 (+0100)
Subject: Merge pull request #932 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=b969b150e8f095dc91c19c7381923c2c19edb968;p=mastodon.git

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

Merge upstream changes
---

b969b150e8f095dc91c19c7381923c2c19edb968