From: ThibG <thib@sitedethib.com>
Date: Thu, 12 Nov 2020 21:57:57 +0000 (+0100)
Subject: Merge pull request #1457 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=3b6e27978d5d8851845c5c15bbe8162b998f59d3;p=mastodon.git

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

Merge upstream changes
---

3b6e27978d5d8851845c5c15bbe8162b998f59d3