From: ThibG <thib@sitedethib.com>
Date: Tue, 15 Dec 2020 17:19:20 +0000 (+0100)
Subject: Merge pull request #1476 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=92cfcf168cae094ece281b3cb6d0f5b1539a8c25;p=mastodon.git

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

Merge upstream changes
---

92cfcf168cae094ece281b3cb6d0f5b1539a8c25