From: ThibG <thib@sitedethib.com>
Date: Wed, 4 Nov 2020 13:52:19 +0000 (+0100)
Subject: Merge pull request #1450 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=1f69ad798d9a42d8ec3df69ded7625524c5eb67c;p=mastodon.git

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

Merge upstream changes
---

1f69ad798d9a42d8ec3df69ded7625524c5eb67c