From: ThibG <thib@sitedethib.com>
Date: Fri, 25 Jan 2019 21:42:21 +0000 (+0100)
Subject: Merge pull request #896 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=270bf7778d681453b259e54b5da55fb449365c8b;p=mastodon.git

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

Merge upstream changes
---

270bf7778d681453b259e54b5da55fb449365c8b