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	More complete tooltip help to describe available substitution vars	2017-04-27 17:16:19 +02:00
class	Merge 5.0	2017-06-12 18:22:51 +02:00
stats	Update code using new css class	2017-05-10 16:41:19 +02:00
tpl	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 11:22:48 +02:00
card.php	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-06-18 21:13:48 +02:00
contact.php	Look and feel v6	2017-05-21 02:43:51 +02:00
document.php	FIX #6945	2017-06-06 10:53:53 +02:00
fiche-rec.php	Fix code comment	2017-06-10 12:56:28 +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
info.php	Page societe/soc.php and compta/facture.php was renamed into card.php	2017-03-20 21:29:22 +01:00
list.php	Fix look and feel v6	2017-06-14 11:28:42 +02:00
note.php	Page societe/soc.php and compta/facture.php was renamed into card.php	2017-03-20 21:29:22 +01:00
prelevement.php	Look and feel v6	2017-05-21 02:43:51 +02:00