From: ThibG <thib@sitedethib.com>
Date: Sat, 8 Aug 2020 17:41:24 +0000 (+0200)
Subject: Merge pull request #1397 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=03712799e2cd51613c8e73cbd6379c8058fae466;p=mastodon.git

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

Merge upstream changes
---

03712799e2cd51613c8e73cbd6379c8058fae466