From: ThibG <thib@sitedethib.com>
Date: Wed, 23 Dec 2020 13:33:47 +0000 (+0100)
Subject: Merge pull request #1481 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=225c934a1b66e2fcbedbda7936666c1ca3c9a04b;p=mastodon.git

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

Merge upstream changes
---

225c934a1b66e2fcbedbda7936666c1ca3c9a04b