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

into develop Conflicts: htdocs/core/ajax/extraparams.php
krattai · Mar 17, 2012 · e16b106 · e16b106
2 parents 181fac1 + 938d0be
commit e16b106
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/htdocs/core/ajax/extraparams.php b/htdocs/core/ajax/extraparams.php
@@ -71,4 +71,4 @@
 	$result=$object->setExtraParameters();
 }
 
-?>
+?>