From: nicolas <nclm@users.noreply.github.com>
Date: Fri, 25 Nov 2016 12:33:00 +0000 (+0100)
Subject: Merge branch 'master' into french-translation
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=959e4b81987080353415556cc3bbd2aab478adb4;p=mastodon.git

Merge branch 'master' into french-translation
---

959e4b81987080353415556cc3bbd2aab478adb4