From: ThibG <thib@sitedethib.com>
Date: Wed, 13 Feb 2019 15:19:15 +0000 (+0100)
Subject: Merge pull request #914 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=435a367c108047170dc752ef766a4264dd90b5c8;p=mastodon.git

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

Merge upstream changes
---

435a367c108047170dc752ef766a4264dd90b5c8