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:
commit
e16b1067cd
@ -71,4 +71,4 @@ if(! empty($id) && ! empty($element) && ! empty($htmlelement) && ! empty($type))
|
||||
$result=$object->setExtraParameters();
|
||||
}
|
||||
|
||||
?>
|
||||
?>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user