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

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

Merge upstream changes
---

1cd7b15532f0cbfeec42460be434bbc9a117764d