From: ThibG <thib@sitedethib.com>
Date: Sun, 5 May 2019 18:53:07 +0000 (+0200)
Subject: Merge pull request #1032 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=e4ca5414a37b7973247a283a364b27052c8f9d1c;p=mastodon.git

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

Merge upstream changes
---

e4ca5414a37b7973247a283a364b27052c8f9d1c