From: nicolas <nclm@users.noreply.github.com>
Date: Wed, 23 Nov 2016 14:43:27 +0000 (+0100)
Subject: Merge branch 'master' into french-translation
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=23677bc51e657522049fb904e626f81f577de515;p=mastodon.git

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

23677bc51e657522049fb904e626f81f577de515