From: ThibG <thib@sitedethib.com>
Date: Tue, 8 Sep 2020 15:20:00 +0000 (+0200)
Subject: Merge pull request #1419 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=6e83020950ab81c6be6b3bfec92643f1b0d23ce6;p=mastodon.git

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

Merge upstream changes
---

6e83020950ab81c6be6b3bfec92643f1b0d23ce6