From: ThibG <thib@sitedethib.com>
Date: Wed, 22 Jul 2020 21:21:11 +0000 (+0200)
Subject: Merge pull request #1387 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=16416e940fd803af92377eee9a1756ef27eed199;p=mastodon.git

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

Merge upstream changes
---

16416e940fd803af92377eee9a1756ef27eed199