From: ThibG <thib@sitedethib.com>
Date: Tue, 7 Jul 2020 14:21:42 +0000 (+0200)
Subject: Merge pull request #1373 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=c4e1b82caf5c932a3c19bc77726c9e3ab3d2c46a;p=mastodon.git

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

Merge upstream changes
---

c4e1b82caf5c932a3c19bc77726c9e3ab3d2c46a