From: ThibG <thib@sitedethib.com>
Date: Fri, 26 Jun 2020 14:36:55 +0000 (+0200)
Subject: Merge pull request #1364 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=10ede3eb27c5de5d4e3a283e333af2a54da6177d;p=mastodon.git

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

Merge upstream changes
---

10ede3eb27c5de5d4e3a283e333af2a54da6177d