From: nicobz25 <nico@alias-serveur.com>
Date: Wed, 5 Apr 2017 11:48:31 +0000 (+0200)
Subject: Merge branch 'master' into patch-1
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=6201fba2d3bcb38d2728b0f21a98fbd4c3b9205a;p=mastodon.git

Merge branch 'master' into patch-1
---

6201fba2d3bcb38d2728b0f21a98fbd4c3b9205a