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

This commit is contained in:
Laurent Destailleur
2026-01-07 11:51:59 +01:00
3 changed files with 4 additions and 4 deletions

View File

@@ -103,8 +103,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 "export DESTIBETARC='/mnt/HDDATA1_LD/Mes Archives/Doli/dolibarr/lastbuild'\n";

View File

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

View File

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