From: ThibG <thib@sitedethib.com>
Date: Wed, 6 Jan 2021 21:03:23 +0000 (+0100)
Subject: Merge pull request #1482 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=d42e7e01dcd464f80637682d4eee6e5a7f36f26e;p=mastodon.git

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

Merge upstream changes
---

d42e7e01dcd464f80637682d4eee6e5a7f36f26e