From: ThibG <thib@sitedethib.com>
Date: Fri, 29 May 2020 20:13:06 +0000 (+0200)
Subject: Merge pull request #1341 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=491588f6b42fb42cf0b8e648aff958bac1add407;p=mastodon.git

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

Merge upstream changes
---

491588f6b42fb42cf0b8e648aff958bac1add407