From: ThibG <thib@sitedethib.com>
Date: Tue, 13 Nov 2018 17:48:07 +0000 (+0100)
Subject: Merge pull request #817 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=e4feef6b5c0d655068daa7554422e8c019a0e3ed;p=mastodon.git

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

Merge upstream changes
---

e4feef6b5c0d655068daa7554422e8c019a0e3ed