From: ThibG <thib@sitedethib.com>
Date: Wed, 15 Apr 2020 16:24:41 +0000 (+0200)
Subject: Merge pull request #1317 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=5fdd5eef5a6b05b072a57e065954fdcb0b4a8898;p=mastodon.git

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

Merge upstream changes
---

5fdd5eef5a6b05b072a57e065954fdcb0b4a8898