arnaud a796a321cc Merge branch '3.9_dalibo' of github.com:ATM-Consulting/dolibarr into NEW_odt_others_objects ... Conflicts: htdocs/core/class/html.formfile.class.php htdocs/product/admin/product.php htdocs/product/card.php		2017-03-10 12:16:55 +01:00
..
card.php	Merge branch '3.9_dalibo' of github.com:ATM-Consulting/dolibarr into NEW_odt_others_objects	2017-03-10 12:16:55 +01:00
index.php	Fix: avoid php non-numeric errors	2017-01-23 12:29:05 +01:00
ldap.php	Fix ambiguous test on ldap return of getAttributes	2016-05-29 11:20:12 +02:00
perms.php	Fix: use reposition	2016-07-27 17:29:27 +02:00