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

into develop

Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/tpl/notes.tpl.php

htdocs/core/class/html.form.class.php

@@ -118,7 +118,11 @@ class Form
      * @param	string	$value			Value to show/edit
      * @param	object	$object			Object
      * @param	boolean	$perm			Permission to allow button to edit parameter
+<<<<<<< HEAD
      * @param	string	$typeofdata		Type of data ('string' by default, 'email', 'numeric:99', 'text' or 'textarea:rows:cols', 'day' or 'datepicker', 'ckeditor:dolibarr_zzz:width:height:1:rows:cols', 'select:xxx'...)
+=======
+     * @param	string	$typeofdata		Type of data ('string' by default, 'email', 'numeric:99', 'text' or 'textarea', 'day' or 'datepicker', 'ckeditor:dolibarr_zzz:width:height:1', 'select:xxx'...)
+>>>>>>> branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git
      * @param	string	$editvalue		When in edit mode, use this value as $value instead of value
      * @param	object	$extObject		External object
      * @param	string	$success		Success message

htdocs/core/tpl/notes.tpl.php

@@ -39,4 +39,4 @@ else $typeofdata='textarea:12:100';
 	</div>
 <?php } ?>
 </div>
-<!-- END PHP TEMPLATE NOTES-->
\ No newline at end of file
+<!-- END PHP TEMPLATE NOTES-->