Laurent Destailleur 2c1e8d6535 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/bookkeeping/balance.php htdocs/expedition/class/expeditionbatch.class.php htdocs/public/payment/newpayment.php htdocs/stripe/config.php		2018-10-16 18:47:11 +02:00
..
card.php	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-16 18:47:11 +02:00
index.html
info.php	Uniformize	2018-08-02 14:03:50 +02:00
payment.php	replace select_date	2018-09-09 10:40:00 +02:00