Laurent Destailleur fe0764be6e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/action/class/actioncomm.class.php htdocs/expedition/class/expedition.class.php htdocs/product/class/product.class.php		2020-11-22 02:32:47 +01:00
..
admin	Merge pull request #15448 from Givriz/dev	2020-11-21 23:44:30 +01:00
class	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-11-22 02:32:47 +01:00
card.php	Merge pull request #15448 from Givriz/dev	2020-11-21 23:44:30 +01:00
index.html	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
info.php	replace deprecated	2020-10-22 22:50:03 +02:00
list.php	Fix warning.	2020-11-21 16:27:50 +01:00