Laurent Destailleur 4d46b2ae58 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/propale/doc/pdf_azur.modules.php htdocs/filefunc.inc.php		2017-08-17 22:21:30 +02:00
..
doc_generic_proposal_odt.modules.php	fix : Various misspelling class (eclipse Oxygen standard PHP control)	2017-07-25 13:32:27 +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
pdf_azur.modules.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-08-17 22:21:30 +02:00