From: ThibG <thib@sitedethib.com>
Date: Thu, 29 Aug 2019 22:18:08 +0000 (+0200)
Subject: Merge pull request #1208 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=2848c08953a8555e06791170dbf1090575e05d8a;p=mastodon.git

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

Merge upstream changes
---

2848c08953a8555e06791170dbf1090575e05d8a