From: ThibG <thib@sitedethib.com>
Date: Thu, 16 Jul 2020 13:01:13 +0000 (+0200)
Subject: Merge pull request #1383 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=801e546ecc1efb4103232d8265229eb455a8dd5b;p=mastodon.git

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

Merge upstream changes
---

801e546ecc1efb4103232d8265229eb455a8dd5b