From: ThibG <thib@sitedethib.com>
Date: Mon, 21 Dec 2020 21:11:27 +0000 (+0100)
Subject: Merge pull request #1480 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=81f4c550b2ed305f39f344d10289b38625f70bf7;p=mastodon.git

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

Merge upstream changes
---

81f4c550b2ed305f39f344d10289b38625f70bf7