From: ThibG <thib@sitedethib.com>
Date: Sat, 4 Apr 2020 22:16:23 +0000 (+0200)
Subject: Merge pull request #1311 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=6e426267a762f3cd1efa2c5fb120a13543567775;p=mastodon.git

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

Merge upstream changes
---

6e426267a762f3cd1efa2c5fb120a13543567775