Skip to content
Snippets Groups Projects
Commit e16b1067 authored by Regis Houssin's avatar Regis Houssin
Browse files
into develop

Conflicts:
	htdocs/core/ajax/extraparams.php
parents 181fac1d 938d0bec
No related branches found
No related tags found
No related merge requests found
......@@ -71,4 +71,4 @@ if(! empty($id) && ! empty($element) && ! empty($htmlelement) && ! empty($type))
$result=$object->setExtraParameters();
}
?>
\ No newline at end of file
?>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment