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

..

ajax

Escape hml tags

2017-06-18 19:42:59 +02:00

class

New: getEntity function use true $shared value by default

2017-05-30 18:50:54 +02:00

tpl

Fix refresh cache value of nb of files into a dir into ECM module

2016-07-30 15:51:27 +02:00

docdir.php

FIX #6945

2017-06-06 10:53:53 +02:00

docfile.php

FIX #6945

2017-06-06 10:53:53 +02:00

docmine.php

FIX #6945

2017-06-06 10:53:53 +02:00

docother.php

[Qual] Close database handler should be after Footer

2015-12-11 19:37:12 +01:00

index_auto.php

FIX #6945

2017-06-06 10:53:53 +02:00

index.php

FIX #6945

2017-06-06 10:53:53 +02:00

search.php

FIX #6945

2017-06-06 10:53:53 +02:00