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

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

Merge upstream changes
---

c7da2cc5a1821e589e7241aec21d8bb426722c2a