From: ThibG <thib@sitedethib.com>
Date: Sat, 1 Aug 2020 19:42:58 +0000 (+0200)
Subject: Merge pull request #1391 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=b12117c4a375b906673a5b67506475a8e78ad6ef;p=mastodon.git

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

Merge upstream changes
---

b12117c4a375b906673a5b67506475a8e78ad6ef