Merge branch 'fr_2.26.0' of github.com:jnavila/git
commitfa89e04fe192fb73c6d43d5dabf14324ec09d9ae
authorJiang Xin <worldhello.net@gmail.com>
Tue, 10 Mar 2020 06:26:58 +0000 (10 14:26 +0800)
committerJiang Xin <worldhello.net@gmail.com>
Tue, 10 Mar 2020 06:26:58 +0000 (10 14:26 +0800)
tree89f67d2b9eb9567e7a1bcdb298c1761244b70a53
parentdd2c2696528990e608f3ee1fce03b53af6c171e4
parent4d9c2902a153362bbc88a3ad589703f3c9fbf04c
Merge branch 'fr_2.26.0' of github.com:jnavila/git

* 'fr_2.26.0' of github.com:jnavila/git:
  l10n: fr v2.26.0 rnd1