Laurent Destailleur 9d0cb07ff9 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ... Conflicts: htdocs/expensereport/payment/payment.php		2017-07-08 21:54:37 +02:00
..
card.php	New: getEntity function use true $shared value by default	2017-05-30 18:50:54 +02:00
index.html
info.php	Review old payment page for expense report	2017-05-27 08:18:53 +02:00
payment.php	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2017-07-08 21:54:37 +02:00