Laurent Destailleur bb6399e12a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/admin/dict.php htdocs/comm/action/class/actioncomm.class.php htdocs/product/card.php		2021-09-30 16:21:36 +02:00
..
stats	replace deprecated	2020-10-22 22:50:03 +02:00
comment.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2021-03-20 12:18:40 +01:00
contact.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2021-03-20 12:18:40 +01:00
document.php	move include_once to include when it's a tpl	2021-04-12 21:25:58 +02:00
list.php	CSS	2021-01-11 20:53:18 +01:00
note.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2021-03-20 12:18:40 +01:00
task.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2021-03-20 12:18:40 +01:00
time.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2021-09-30 16:21:36 +02:00