Laurent Destailleur a93ba86ce0 Merge remote-tracking branch 'origin/3.7' into develop ...

Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/expedition/modules_expedition.php
	htdocs/core/modules/modContrat.class.php
	htdocs/expedition/class/expedition.class.php

2015-05-07 13:35:09 +02:00

..

doc

Merge branch 'develop' into incoterm

2015-02-23 10:42:01 +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_expedition_ribera.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

mod_expedition_safor.php

More substitutions

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

modules_expedition.php

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

2015-05-07 13:35:09 +02:00