From: ThibG <thib@sitedethib.com>
Date: Fri, 24 May 2019 14:30:49 +0000 (+0200)
Subject: Merge pull request #1068 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=fd0487c04fbcbc89fb351b156999a6dc3a99d68b;p=mastodon.git

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

Merge upstream changes
---

fd0487c04fbcbc89fb351b156999a6dc3a99d68b