Laurent Destailleur 7f9d6a5458 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/public/paybox/newpayment.php htdocs/public/payment/newpayment.php htdocs/public/paypal/newpayment.php htdocs/public/stripe/newpayment.php		2018-01-31 20:25:24 +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
tva.class.php	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-01-31 20:25:24 +01:00