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

into develop

Conflicts:
	htdocs/core/ajax/extraparams.php
This commit is contained in:
Regis Houssin 2012-03-17 09:47:56 +01:00
commit e16b1067cd

View File

@ -71,4 +71,4 @@ if(! empty($id) && ! empty($element) && ! empty($htmlelement) && ! empty($type))
$result=$object->setExtraParameters();
}
?>
?>