From: ThibG <thib@sitedethib.com>
Date: Sun, 2 Aug 2020 14:05:01 +0000 (+0200)
Subject: Merge pull request #1392 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=141ac8db8b98230188b13f1da801611bcdc6a9f1;p=mastodon.git

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

Merge upstream changes
---

141ac8db8b98230188b13f1da801611bcdc6a9f1