From: ThibG <thib@sitedethib.com>
Date: Thu, 10 Dec 2020 09:25:52 +0000 (+0100)
Subject: Merge pull request #1473 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=cbe9b0640ba4d466c8b24fb233dff60e9f8d00f0;p=mastodon.git

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

Merge upstream changes
---

cbe9b0640ba4d466c8b24fb233dff60e9f8d00f0