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

Merge remote-tracking branch 'origin/3.6' into 3.7

2015-12-18 21:03:57 +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_commande_marbre.php

More substitutions

2014-06-12 11:31:53 +02:00

mod_commande_saphir.php

Fix: Masks works with thirdparty type

2015-03-04 18:18:55 +01:00

modules_commande.php

Created a method generateDocument for several classes

2014-09-16 12:30:37 +02:00