Laurent Destailleur 86a6a83647 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/admin/tools/index.php htdocs/bookmarks/bookmarks.lib.php htdocs/compta/facture.php htdocs/core/tpl/passwordforgotten.tpl.php htdocs/fourn/ajax/getSupplierPrices.php htdocs/main.inc.php htdocs/product/stats/card.php htdocs/public/paypal/paymentko.php		2017-06-18 21:13:48 +02:00
..
class	Fix missing key import_key and extraparams	2017-06-16 12:57:30 +02:00
rapport	Fix look and feel v6	2017-06-10 13:44:20 +02:00
card.php	Fix: error when the project module not enabled	2017-06-14 07:40:11 +02:00
document.php	FIX #6945	2017-06-06 10:53:53 +02:00
index.php	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-06-18 21:13:48 +02:00
info.php	Work on 6.0 look and feel	2017-03-31 17:41:20 +02:00
listactions.php	Fix look and feel v6	2017-06-10 13:54:43 +02:00
pertype.php	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-06-18 21:13:48 +02:00
peruser.php	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-06-18 21:13:48 +02:00