Laurent Destailleur 8e0da9bfeb Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/holiday/document.php		2017-10-04 13:32:53 +02:00
..
doc_generic_proposal_odt.modules.php	NEW Generated files are now indexed in database	2017-08-18 23:19:55 +02:00
index.html
pdf_azur.modules.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-04 13:32:53 +02:00