From: ThibG <thib@sitedethib.com>
Date: Mon, 20 Apr 2020 16:25:18 +0000 (+0200)
Subject: Merge pull request #1320 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=60f8a63a76f7c866b5338c33a8b897ba022368ca;p=mastodon.git

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

Merge upstream changes
---

60f8a63a76f7c866b5338c33a8b897ba022368ca