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

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

Merge upstream changes
---

787449c12f121737c4319ec274300fa9a330fe9b