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

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

Merge upstream changes
---

74ee5bdf37799fba5990a6b492e3d52c32efe8d7