From: ThibG <thib@sitedethib.com>
Date: Thu, 4 Apr 2019 13:13:18 +0000 (+0200)
Subject: Merge pull request #981 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=30500dff7cbf27fbee6eb45e20cc24ca0b7a9e77;p=mastodon.git

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

Merge upstream changes
---

30500dff7cbf27fbee6eb45e20cc24ca0b7a9e77