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

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

Merge upstream changes
---

4dcabe6f9c776ea230b23dc60ec9b8a8fbed82df