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_generic_order_odt.modules.php	FIX Error generating ODT when option to use contact on doc on	2018-10-31 15:31:22 +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
pdf_einstein.modules.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-12-18 21:35:30 +01:00
pdf_proforma.modules.php	Fix doxygen	2016-05-18 14:43:56 +02:00