From: ThibG <thib@sitedethib.com>
Date: Tue, 30 Jul 2019 13:40:28 +0000 (+0200)
Subject: Merge pull request #1183 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=4ecfa8f298399d9857737f212fc8f5767ffa7c6d;p=mastodon.git

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

Merge upstream changes
---

4ecfa8f298399d9857737f212fc8f5767ffa7c6d