lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/ajax/extraparams.php
View File

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