Skip to content
Permalink
Browse files

Merge remote-tracking branch 'origin/3.6' into 3.7

  • Loading branch information...
eldy committed Apr 29, 2016
2 parents 68e96b9 + 2a27fe0 commit 211d217f8c558767a7683f3345e3b59d2cbb6799
Showing with 1 addition and 1 deletion.
  1. +1 −1 build/makepack-dolibarr.pl
@@ -376,7 +376,7 @@

print 'Run git tag -a -m "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'" "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'"'."\n";
$ret=`git tag -a -m "$MAJOR.$MINOR.$BUILD" "$MAJOR.$MINOR.$BUILD" 2>&1`;
if ($ret =~ /already exists/)
if ($ret =~ /(already exists|existe déjà)/)
{
print "WARNING: Tag ".$MAJOR.'.'.$MINOR.'.'.$BUILD." already exists. Overwrite (y/N) ? ";
$QUESTIONOVERWRITETAG=<STDIN>;

0 comments on commit 211d217

Please sign in to comment.
You can’t perform that action at this time.