From: ThibG <thib@sitedethib.com>
Date: Sun, 5 Jul 2020 20:55:09 +0000 (+0200)
Subject: Merge pull request #1371 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=94e09d309cb068ea92919767e40e655260ac43cb;p=mastodon.git

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

Merge upstream changes
---

94e09d309cb068ea92919767e40e655260ac43cb