From: ThibG <thib@sitedethib.com>
Date: Thu, 27 Feb 2020 11:38:17 +0000 (+0100)
Subject: Merge pull request #1290 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=e1d29f7d9f85a25af7a1595d2c9afc127ab36ca7;p=mastodon.git

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

Merge upstream changes
---

e1d29f7d9f85a25af7a1595d2c9afc127ab36ca7