From: ThibG <thib@sitedethib.com>
Date: Wed, 19 Aug 2020 17:36:58 +0000 (+0200)
Subject: Merge pull request #1408 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=83cd512777e1b479b4721f4d0253745949962910;p=mastodon.git

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

Merge upstream changes
---

83cd512777e1b479b4721f4d0253745949962910