From: ThibG <thib@sitedethib.com>
Date: Thu, 21 Jan 2021 16:51:43 +0000 (+0100)
Subject: Merge pull request #1487 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=d1255ab8a5101bc04af4a5214f975edf443a37d9;p=mastodon.git

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

Merge upstream changes
---

d1255ab8a5101bc04af4a5214f975edf443a37d9