Laurent Destailleur 5ea47f3ade Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/resultat/index.php htdocs/product/admin/product.php htdocs/projet/tasks/list.php		2020-07-08 18:11:58 +02:00
..
stats	add new rule	2020-05-21 15:05:19 +02:00
comment.php	add new rule	2020-05-21 15:05:19 +02:00
contact.php	add new rule	2020-05-21 15:05:19 +02:00
document.php	add new rule	2020-05-21 15:05:19 +02:00
list.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-07-08 18:11:58 +02:00
note.php	add new rule	2020-05-21 15:05:19 +02:00
task.php	add new rule	2020-05-21 15:05:19 +02:00
time.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-06-18 15:50:31 +02:00