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

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

Merge upstream changes
---

c2fa0f7c40bcc4064e8baaa221665eadd391c001