mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-02-12 10:52:37 +01:00
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:
@@ -71,4 +71,4 @@ if(! empty($id) && ! empty($element) && ! empty($htmlelement) && ! empty($type))
|
||||
$result=$object->setExtraParameters();
|
||||
}
|
||||
|
||||
?>
|
||||
?>
|
||||
|
||||
Reference in New Issue
Block a user