Laurent Destailleur 4b9f54e571 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/install/mysql/data/llx_accounting.sql htdocs/install/mysql/migration/5.0.0-6.0.0.sql htdocs/install/mysql/tables/llx_holiday_config.sql		2017-09-01 17:34:57 +02:00
..
doc	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-09-01 17:34:57 +02:00
index.html
mod_supplier_proposal_marbre.php
mod_supplier_proposal_saphir.php	Code was corrupted with very bad commits. I restore files manually.	2016-03-25 15:53:44 +01:00
modules_supplier_proposal.php	NEW Removed commande_pdf_create, contract_pdf_create,expedition_pdf_create, facture_pdf_create, delivery_order_pdf_create, task_pdf_create, project_pdf_create, propale_pdf_create, supplier_invoice_pdf_create, supplier_order_pdf_create, supplier_proposal_pdf_create deprecated functions	2017-01-16 21:59:02 +01:00