From: ThibG <thib@sitedethib.com>
Date: Fri, 10 Jul 2020 18:02:28 +0000 (+0200)
Subject: Merge pull request #1381 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=7a23347db5be3f262dbcafbecf768588dc648bda;p=mastodon.git

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

Merge upstream changes
---

7a23347db5be3f262dbcafbecf768588dc648bda