From: ThibG <thib@sitedethib.com>
Date: Sat, 29 Feb 2020 11:50:44 +0000 (+0100)
Subject: Merge pull request #1291 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=907ebcfd43c7c051de831944a29620580fa8faa5;p=mastodon.git

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

Merge upstream changes
---

907ebcfd43c7c051de831944a29620580fa8faa5