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
..
admin	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 11:22:48 +02:00
frames.php	Escape hml tags	2017-06-18 19:42:59 +02:00
frametop.php	Standardize code	2017-05-13 17:04:46 +02:00
index.html	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00