From: ThibG <thib@sitedethib.com>
Date: Mon, 18 Jan 2021 13:37:57 +0000 (+0100)
Subject: Merge pull request #1484 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=73d5b050196e9fdbe4c09f7d8650eed7562f2a08;p=mastodon.git

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

Merge upstream changes
---

73d5b050196e9fdbe4c09f7d8650eed7562f2a08