From: ThibG <thib@sitedethib.com>
Date: Tue, 11 Aug 2020 18:15:03 +0000 (+0200)
Subject: Merge pull request #1398 from ThibG/glitch-soc/master
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=59c44ce323d135223fcda0183c6fbdf64a79799a;p=mastodon.git

Merge pull request #1398 from ThibG/glitch-soc/master

Merge upstream changes
---

59c44ce323d135223fcda0183c6fbdf64a79799a