From: nicolas <nclm@users.noreply.github.com>
Date: Thu, 24 Nov 2016 19:13:30 +0000 (+0100)
Subject: Merge branch 'master' into french-translation
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=60577f4c6ee9f4a4c9af0a41a8954e19a5f2c8cf;p=mastodon.git

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

60577f4c6ee9f4a4c9af0a41a8954e19a5f2c8cf