From: ThibG <thib@sitedethib.com>
Date: Thu, 8 Aug 2019 07:25:00 +0000 (+0200)
Subject: Merge pull request #1194 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=aa485d6f055b93fd7a9df8b47ed96122b38af39e;p=mastodon.git

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

Merge upstream changes
---

aa485d6f055b93fd7a9df8b47ed96122b38af39e