From: ThibG <thib@sitedethib.com>
Date: Sat, 19 Dec 2020 01:17:02 +0000 (+0100)
Subject: Merge pull request #1477 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=79c57810b7fea1962c9746d74c90235ad4e3e899;p=mastodon.git

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

Merge upstream changes
---

79c57810b7fea1962c9746d74c90235ad4e3e899