From: ThibG <thib@sitedethib.com>
Date: Sat, 25 Apr 2020 15:50:22 +0000 (+0200)
Subject: Merge pull request #1321 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=9c61dadc0db7009853c6b2345a02c3b219022929;p=mastodon.git

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

Merge upstream changes
---

9c61dadc0db7009853c6b2345a02c3b219022929