From: ThibG <thib@sitedethib.com>
Date: Fri, 11 Oct 2019 20:28:11 +0000 (+0200)
Subject: Merge pull request #1233 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=ef925f31a66d1cbc95bff11669d05e2924d8ce85;p=mastodon.git

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

Merge upstream changes
---

ef925f31a66d1cbc95bff11669d05e2924d8ce85