From: ThibG <thib@sitedethib.com>
Date: Thu, 21 Nov 2019 09:01:26 +0000 (+0100)
Subject: Merge pull request #1246 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=55f5e81a9dc4c6cede5d43e549061be2ea9be614;p=mastodon.git

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

Merge upstream changes
---

55f5e81a9dc4c6cede5d43e549061be2ea9be614