From: ThibG <thib@sitedethib.com>
Date: Wed, 15 May 2019 16:44:21 +0000 (+0200)
Subject: Merge pull request #1049 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=c1cf8c1636e0a639cced585f0cb234547a64d417;p=mastodon.git

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

Merge upstream changes
---

c1cf8c1636e0a639cced585f0cb234547a64d417