From: Jiang Xin <worldhello.net@gmail.com>
Date: Sun, 3 Jun 2018 23:58:22 +0000 (+0800)
Subject: Merge branch 'fr_2.18_round1' of git://github.com/jnavila/git
X-Git-Tag: v2.18.0~12^2~1^2~3^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a093a5da48dcfb45955c840398be574cc2dd80d7;p=git

Merge branch 'fr_2.18_round1' of git://github.com/jnavila/git

* 'fr_2.18_round1' of git://github.com/jnavila/git:
  l10n: fr.po v2.18 round 1
---

a093a5da48dcfb45955c840398be574cc2dd80d7