From: ThibG <thib@sitedethib.com>
Date: Sat, 5 Oct 2019 16:04:36 +0000 (+0200)
Subject: Merge pull request #1228 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=3921125e5578fb3871fdcae0e8e8a77179f1ad72;p=mastodon.git

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

Merge upstream changes
---

3921125e5578fb3871fdcae0e8e8a77179f1ad72