Laurent Destailleur ebf68ecbe0 Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: .travis.yml htdocs/contrat/class/contrat.class.php htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php htdocs/core/modules/project/pdf/pdf_baleine.modules.php		2015-12-18 21:03:57 +01:00
..
doc_generic_order_odt.modules.php	Fix: Bad parameter of get_substitutionarray_other	2014-10-15 18:16:41 +02: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 remote-tracking branch 'origin/3.6' into 3.7	2015-12-18 21:03:57 +01:00
pdf_proforma.modules.php	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-12-18 21:03:57 +01:00