From: ThibG <thib@sitedethib.com>
Date: Wed, 8 Jul 2020 14:25:03 +0000 (+0200)
Subject: Merge pull request #1378 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=54e62f8500e69fb0172d565d062354bc6c19b012;p=mastodon.git

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

Merge upstream changes
---

54e62f8500e69fb0172d565d062354bc6c19b012