From: ThibG <thib@sitedethib.com>
Date: Thu, 13 Aug 2020 21:10:19 +0000 (+0200)
Subject: Merge pull request #1404 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=6fece522f9dca9d13ae2d4437b395a92ddb106c9;p=mastodon.git

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

Merge upstream changes
---

6fece522f9dca9d13ae2d4437b395a92ddb106c9