Merge branch 'maint'

* maint:
  fix shell syntax error in template
  l10n: fr.po: hotfix for commit 6b388fc
This commit is contained in:
Junio C Hamano 2013-09-03 13:58:16 -07:00
commit 0a41de8f81
3 changed files with 875 additions and 718 deletions

View file

@ -15,6 +15,7 @@ Members: Thomas Rast <trast@student.ethz.ch>
Language: fr (French)
Repository: https://github.com/jnavila/git
Leader: Jean-Noël Avila <jn.avila@free.fr>
Members: Sébastien Helleu <flashcode@flashtux.org>
Language: is (Icelandic)
Leader: Ævar Arnfjörð Bjarmason <avarab@gmail.com>

1591
po/fr.po

File diff suppressed because it is too large Load diff

View file

@ -30,6 +30,7 @@ do
if [ "$local_sha" = $z40 ]
then
# Handle delete
:
else
if [ "$remote_sha" = $z40 ]
then