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_shipment_odt.modules.php	FIX Can use odx templates that does not include lines tags	2018-02-24 12:34:15 +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_merou.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_rouget.modules.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-12-18 21:35:30 +01:00