From: ThibG <thib@sitedethib.com>
Date: Tue, 25 Jun 2019 20:43:33 +0000 (+0200)
Subject: Merge pull request #1138 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=ed10ae2693e83ac7fbac7273b2cf2ca424aca0c4;p=mastodon.git

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

Merge upstream changes
---

ed10ae2693e83ac7fbac7273b2cf2ca424aca0c4