From: ThibG <thib@sitedethib.com>
Date: Sun, 9 Dec 2018 15:38:09 +0000 (+0100)
Subject: Merge pull request #849 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=c6b7b984891413cb1db673df2cbea12f8e6f0f05;p=mastodon.git

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

Merge upstream changes
---

c6b7b984891413cb1db673df2cbea12f8e6f0f05