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

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

Merge upstream changes
---

a7a47834e50645746355e2b9a88244c1804c73cd