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
..
ajaxdirpreview.php	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-06-18 21:13:48 +02:00
ajaxdirtree.php	Remove not so usefull plugin jquery layout (prepare js upgrades)	2017-02-22 19:36:57 +01:00
bankconciliate.php	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-06-18 21:13:48 +02:00
box.php	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-06-18 21:13:48 +02:00
check_notifications.php	Work on modulebuilder tool	2017-05-27 19:05:36 +02:00
constantonoff.php	Escape hml tags	2017-06-18 19:42:59 +02:00
contacts.php	Escape hml tags	2017-06-18 19:42:59 +02:00
extraparams.php	Escape hml tags	2017-06-18 19:42:59 +02:00
fileupload.php	Removed closing php tag	2014-05-03 18:18:44 +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
loadinplace.php	Escape hml tags	2017-06-18 19:42:59 +02:00
objectonoff.php	Escape hml tags	2017-06-18 19:42:59 +02:00
price.php	Escape hml tags	2017-06-18 19:42:59 +02:00
row.php	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-06-18 21:13:48 +02:00
saveinplace.php	Escape hml tags	2017-06-18 19:42:59 +02:00
security.php	Escape hml tags	2017-06-18 19:42:59 +02:00
selectsearchbox.php	FIX quick search boxes when nojs or when using smartphone	2016-09-03 12:56:49 +02:00
vatrates.php	Escape hml tags	2017-06-18 19:42:59 +02:00
ziptown.php	Escape hml tags	2017-06-18 19:42:59 +02:00