From: ThibG <thib@sitedethib.com>
Date: Wed, 13 May 2020 21:46:09 +0000 (+0200)
Subject: Merge pull request #1327 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=e1d282023432ff4a88cb795f3a9889704314e448;p=mastodon.git

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

Merge upstream changes
---

e1d282023432ff4a88cb795f3a9889704314e448