From: ThibG <thib@sitedethib.com>
Date: Sat, 23 Nov 2019 23:36:35 +0000 (+0100)
Subject: Merge pull request #1247 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=2448568d341dcf288bf004826666ab9010601b47;p=mastodon.git

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

Merge upstream changes
---

2448568d341dcf288bf004826666ab9010601b47