From: ThibG <thib@sitedethib.com>
Date: Tue, 9 Jun 2020 11:00:24 +0000 (+0200)
Subject: Merge pull request #1350 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=3287a10fe9658a6c370431a925abc50d4f68ea08;p=mastodon.git

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

Merge upstream changes
---

3287a10fe9658a6c370431a925abc50d4f68ea08