From: ThibG <thib@sitedethib.com>
Date: Sun, 3 May 2020 21:29:41 +0000 (+0200)
Subject: Merge pull request #1324 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=75b0fa8b760b8829b933b249ac48965abdab15ae;p=mastodon.git

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

Merge upstream changes
---

75b0fa8b760b8829b933b249ac48965abdab15ae