From: ThibG <thib@sitedethib.com>
Date: Fri, 24 Jan 2020 16:28:22 +0000 (+0100)
Subject: Merge pull request #1265 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=0be67df4f0a64367d9e376b06bd3fd2fb9ca8195;p=mastodon.git

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

Merge upstream changes
---

0be67df4f0a64367d9e376b06bd3fd2fb9ca8195