Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git

into develop

Conflicts:
	htdocs/admin/syslog.php
This commit is contained in:
Laurent Destailleur
2012-02-23 03:32:19 +01:00
10 changed files with 180 additions and 80 deletions

View File

@@ -249,8 +249,7 @@ print "</form>\n";
dol_htmloutput_mesg($mesg);
llxFooter();
$db->close();
?>
?>