Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
1443f35cf1
2 changed files with 3 additions and 3 deletions
|
|
@ -477,14 +477,14 @@ if ($nboftargetok) {
|
|||
{
|
||||
print 'Run git tag -a -f -m "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'" "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'"'."\n";
|
||||
$ret=`git tag -a -f -m "$MAJOR.$MINOR.$BUILD" "$MAJOR.$MINOR.$BUILD"`;
|
||||
print 'Run git push $GITREMOTENAME -f "$MAJOR.$MINOR.$BUILD"'."\n";
|
||||
print 'Run git push '.$GITREMOTENAME.' -f "$MAJOR.$MINOR.$BUILD"'."\n";
|
||||
$ret=`git push $GITREMOTENAME -f -"$MAJOR.$MINOR.$BUILD"`;
|
||||
#$ret=`git push -f origin "$MAJOR.$MINOR.$BUILD"`;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
print 'Run git push $GITREMOTENAME --tags'."\n";
|
||||
print "Run git push $GITREMOTENAME --tags\n";
|
||||
$ret=`git push $GITREMOTENAME --tags`;
|
||||
#$ret=`git push origin "$MAJOR.$MINOR.$BUILD"`;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ class Interventions extends DolibarrApi
|
|||
public static $FIELDSLINE = array(
|
||||
'description',
|
||||
'date',
|
||||
'duree',
|
||||
'duration',
|
||||
);
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Reference in a new issue