diff options
| author |  Jiang Xin <worldhello.net@gmail.com> | 2017-07-27 23:10:13 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2017-07-27 23:10:13 +0800 |
| commit | 437d21241319800c0935d8ca382c01718d4e700d (patch) | |
| tree | 1fe5f40715b092f8ccadce6e1e3e82f54c527d28 /git-merge-resolve.sh | |
| parent | Merge branch 'master' of https://github.com/Softcatala/git-po (diff) | |
| parent | l10n: fr.po v2.14.0 rnd 2 (diff) | |
| download | tgif-437d21241319800c0935d8ca382c01718d4e700d.tar.xz | |
Merge branch 'fr_l10n_v2.14.0rnd2' of git://github.com/jnavila/git
* 'fr_l10n_v2.14.0rnd2' of git://github.com/jnavila/git:
l10n: fr.po v2.14.0 rnd 2
l10n: fr.po Fix some french typos
l10n: fr.po Fix typo
l10n: fr.po Fix some translations
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions