From: ThibG <thib@sitedethib.com>
Date: Mon, 22 Apr 2019 21:06:54 +0000 (+0200)
Subject: Merge pull request #1002 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=91a74ea86bb0c5b0016012ad50231956ff26592c;p=mastodon.git

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

Merge upstream changes
---

91a74ea86bb0c5b0016012ad50231956ff26592c