From: ThibG <thib@sitedethib.com>
Date: Tue, 29 Sep 2020 08:29:42 +0000 (+0200)
Subject: Merge pull request #1430 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=62e3f588dee75fc6a37457f8218630daad056cba;p=mastodon.git

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

Merge upstream changes
---

62e3f588dee75fc6a37457f8218630daad056cba