From: ThibG <thib@sitedethib.com>
Date: Thu, 2 Apr 2020 20:17:29 +0000 (+0200)
Subject: Merge pull request #1310 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=5c5317041f17375666bfaf4788f0adf71804b47d;p=mastodon.git

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

Merge upstream changes
---

5c5317041f17375666bfaf4788f0adf71804b47d