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

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

Merge upstream changes
---

d967251fdc3826ad27d30e55258cfa4cdfd7c871