From: ThibG <thib@sitedethib.com>
Date: Tue, 28 May 2019 17:33:15 +0000 (+0200)
Subject: Merge pull request #1073 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=2f83ffa1bd1a80567c512db79273dc75d32ef069;p=mastodon.git

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

Merge upstream changes
---

2f83ffa1bd1a80567c512db79273dc75d32ef069