From: ThibG <thib@sitedethib.com>
Date: Wed, 1 Jul 2020 19:51:16 +0000 (+0200)
Subject: Merge pull request #1369 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=665eb1affe7ba765af476e6f00096aad3af70735;p=mastodon.git

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

Merge upstream changes
---

665eb1affe7ba765af476e6f00096aad3af70735