Laurent Destailleur 6d84036f66 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/action/index.php htdocs/contact/list.php htdocs/core/class/html.form.class.php htdocs/expensereport/card.php htdocs/install/doctemplates/shipment/template_shipment.odt htdocs/public/payment/newpayment.php		2018-12-01 19:23:06 +01:00
..
index.php
newpayment.php	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-12-01 19:23:06 +01:00
paymentko.php	Fix message content and language	2018-11-20 20:13:16 +01:00
paymentok.php	Fix message content and language	2018-11-20 20:13:16 +01:00