From: ThibG <thib@sitedethib.com>
Date: Sun, 30 Aug 2020 16:34:51 +0000 (+0200)
Subject: Merge pull request #1411 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=f715e8b51612820a18fa307e4465eb0c1a088f86;p=mastodon.git

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

Merge upstream changes
---

f715e8b51612820a18fa307e4465eb0c1a088f86