Laurent Destailleur 57664c5a26 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/commande/list.php htdocs/public/payment/newpayment.php htdocs/public/paypal/newpayment.php		2018-05-29 12:47:42 +02:00
..
index.php
newpayment.php	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-05-29 12:47:42 +02:00
paymentko.php	Debug online payment using unique form	2017-09-20 19:34:14 +02:00
paymentok.php	Fix PSR2	2018-04-22 20:08:29 +02:00