From: ThibG <thib@sitedethib.com>
Date: Wed, 25 Nov 2020 18:01:15 +0000 (+0100)
Subject: Merge pull request #1468 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=29812c2e59e02ea5ff8e4818a38b59944e2367ba;p=mastodon.git

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

Merge upstream changes
---

29812c2e59e02ea5ff8e4818a38b59944e2367ba