From: ThibG <thib@sitedethib.com>
Date: Sun, 23 Dec 2018 14:23:12 +0000 (+0100)
Subject: Merge pull request #871 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=8a3e4a48838405a7a78f2b46cc2b2a7c8fa412fa;p=mastodon.git

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

Merge upstream changes
---

8a3e4a48838405a7a78f2b46cc2b2a7c8fa412fa