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

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

Merge upstream changes
---

f328f2faa3fbdb182921366c6a20e745c069b840