From: ThibG <thib@sitedethib.com>
Date: Fri, 10 Jul 2020 15:29:43 +0000 (+0200)
Subject: Merge pull request #1380 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=ddf7cc1ab56b888fdf61ee8cb1456c71cd9c33c9;p=mastodon.git

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

Merge upstream changes
---

ddf7cc1ab56b888fdf61ee8cb1456c71cd9c33c9