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

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

Merge upstream changes
---

24696458bf22c8529b49f89b2791e3e07583b7e0