forked from Wavyzz/dolibarr
Conflicts: htdocs/core/class/html.form.class.php htdocs/product/class/product.class.php htdocs/public/notice.php htdocs/user/card.php
Conflicts: htdocs/core/class/html.form.class.php htdocs/product/class/product.class.php htdocs/public/notice.php htdocs/user/card.php