From: ThibG <thib@sitedethib.com>
Date: Sat, 19 Dec 2020 14:31:39 +0000 (+0100)
Subject: Merge pull request #1478 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=61d5744dcc33d4cfdd26a38af138a4a416a93868;p=mastodon.git

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

Merge upstream changes
---

61d5744dcc33d4cfdd26a38af138a4a416a93868