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

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

Merge upstream changes
---

d3aaa08730901e7c97c6aeb1ebf56f2a027c78a2