From: ThibG <thib@sitedethib.com>
Date: Fri, 24 Jul 2020 10:32:33 +0000 (+0200)
Subject: Merge pull request #1388 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=913141c6780bef463a2fe855aaeb0b429f806ea2;p=mastodon.git

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

Merge upstream changes
---

913141c6780bef463a2fe855aaeb0b429f806ea2