From: ThibG <thib@sitedethib.com>
Date: Sat, 5 Dec 2020 21:03:28 +0000 (+0100)
Subject: Merge pull request #1470 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=25f725d67a6d2542cd586ab7c56baca572eb4f88;p=mastodon.git

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

Merge upstream changes
---

25f725d67a6d2542cd586ab7c56baca572eb4f88