Laurent Destailleur a607ff4c1a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/functions2.lib.php htdocs/core/lib/project.lib.php htdocs/langs/fr_FR/bills.lang htdocs/langs/fr_FR/products.lang htdocs/langs/fr_FR/stocks.lang htdocs/langs/fr_FR/ticket.lang htdocs/mrp/mo_card.php		2020-06-18 15:50:31 +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	add new rule	2020-05-21 15:05:19 +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