From: ThibG <thib@sitedethib.com>
Date: Tue, 12 Feb 2019 19:29:55 +0000 (+0100)
Subject: Merge pull request #913 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=a3ba28eb17d75af37396359e8c37675e06605ccf;p=mastodon.git

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

Merge upstream changes
---

a3ba28eb17d75af37396359e8c37675e06605ccf