Laurent Destailleur 0381cf5665 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop ... Conflicts: htdocs/core/modules/modPaymentByBankTransfer.class.php htdocs/filefunc.inc.php		2020-08-14 11:08:53 +02:00
..
card.php	Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop	2020-08-14 11:08:53 +02: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