From: ThibG <thib@sitedethib.com>
Date: Sun, 2 Aug 2020 20:46:25 +0000 (+0200)
Subject: Merge pull request #1393 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=b988bc75649425266e848a25290a86a9fc53625e;p=mastodon.git

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

Merge upstream changes
---

b988bc75649425266e848a25290a86a9fc53625e