From: ThibG <thib@sitedethib.com>
Date: Wed, 9 Dec 2020 18:06:13 +0000 (+0100)
Subject: Merge pull request #1472 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=b27d11dd3320cb005561f0bb1b81baecea8a7c43;p=mastodon.git

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

Merge upstream changes
---

b27d11dd3320cb005561f0bb1b81baecea8a7c43