From: ThibG <thib@sitedethib.com>
Date: Fri, 13 Nov 2020 23:50:43 +0000 (+0100)
Subject: Merge pull request #1465 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=db01f8b942b72eaa2eacbb144261b002f8079c9c;p=mastodon.git

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

Merge upstream changes
---

db01f8b942b72eaa2eacbb144261b002f8079c9c