Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 23.0

This commit is contained in:
Laurent Destailleur 2026-01-07 01:14:42 +01:00
commit 9ab0d26e71
3 changed files with 4 additions and 4 deletions

View file

@ -114,8 +114,8 @@ if ( !$ENV{"DESTIBETARC"} || !$ENV{"DESTISTABLE"} ) {
print "On Linux:\n";
print "export DESTIBETARC='/tmp'; export DESTISTABLE='/tmp';\n";
print "On Windows:\n";
print "set DESTIBETARC=c:/tmp\n";
print "set DESTISTABLE=c:/tmp\n";
print "set DESTIBETARC=c:/temp\n";
print "set DESTISTABLE=c:/temp\n";
print "\n";
print "Example in .bashrc:\n";
print

View file

@ -45,7 +45,7 @@
}
.no-bottom {
padding-bottom: 0;
padding-bottom: 0 !important;
}
.small {

View file

@ -178,7 +178,7 @@ if ($action == "set") { // Test on permissions not required here
$morehtml = '';
pHeader($langs->trans("DolibarrSetup"), "step5", 'set', '', '', 'main-inside main-inside-borderbottom');
pHeader($langs->trans("DolibarrSetup"), "step5", 'set', '', '', 'main-inside main-inside-borderbottom no-bottom');
print '<br>';
// Test if we can run a first install process