Laurent Destailleur f1dac82a53 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/adherents/card.php htdocs/categories/edit.php htdocs/contact/card.php htdocs/core/class/extrafields.class.php htdocs/product/stock/card.php		2021-12-08 17:56:05 +01:00
..
card.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2021-12-08 17:56:05 +01:00
index.html
ldap.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2021-05-17 07:33:28 +02:00
list.php	Scrutinizer Auto-Fixes	2020-10-31 13:32:18 +00:00
perms.php	end of dol_fiche_end	2020-10-27 18:19:31 +01:00