Laurent Destailleur 50790a7f36 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/categories/class/categorie.class.php htdocs/filefunc.inc.php		2020-04-05 03:44:06 +02:00
..
migrate_picture_path.php	FIX : picture migration script from doli 9.0	2020-03-31 10:31:18 +02:00
sync_groups_dolibarr2ldap.php	Move Gnu.org to https	2019-09-23 21:55:30 +02:00
sync_groups_ldap2dolibarr.php	Move Gnu.org to https	2019-09-23 21:55:30 +02:00
sync_users_dolibarr2ldap.php	Move Gnu.org to https	2019-09-23 21:55:30 +02:00
sync_users_ldap2dolibarr.php	Move Gnu.org to https	2019-09-23 21:55:30 +02:00