Laurent Destailleur 344098fe23 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/contrat/card.php htdocs/core/actions_fetchobject.inc.php htdocs/langs/fr_FR/contracts.lang htdocs/langs/fr_FR/loan.lang htdocs/langs/fr_FR/stocks.lang		2020-07-05 13:01:00 +02:00
..
card.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-07-05 13:01:00 +02:00
index.html	add index.html in user directory	2018-09-30 14:55:15 +02:00
ldap.php	add new rule	2020-05-21 15:05:19 +02:00
list.php	add new rule	2020-05-21 15:05:19 +02:00
perms.php	add new rule	2020-05-21 15:05:19 +02:00