Laurent Destailleur fb8c3f01a4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/core/modules/project/doc/pdf_baleine.modules.php htdocs/core/modules/project/doc/pdf_beluga.modules.php		2018-12-18 21:35:30 +01:00
..
doc	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-12-18 21:35:30 +01: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
mod_contract_magre.php	Code was corrupted with very bad commits. I restore files manually.	2016-03-25 15:53:44 +01:00
mod_contract_olive.php	Fix: doxygen	2014-09-28 02:46:20 +02:00
mod_contract_serpis.php	Fix regression db => this->db	2017-09-15 19:37:23 +02:00
modules_contract.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