From: ThibG <thib@sitedethib.com>
Date: Sat, 7 Nov 2020 20:47:31 +0000 (+0100)
Subject: Merge pull request #1453 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=cfb16b9b70a50ec5451c9aebb2c35d3a44701311;p=mastodon.git

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

Merge upstream changes
---

cfb16b9b70a50ec5451c9aebb2c35d3a44701311