From: ThibG <thib@sitedethib.com>
Date: Fri, 8 Mar 2019 00:47:36 +0000 (+0100)
Subject: Merge pull request #945 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=29a09858f6700c0a6eb17797836589ed0839dec9;p=mastodon.git

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

Merge upstream changes
---

29a09858f6700c0a6eb17797836589ed0839dec9