Maxime Kohlhaas 72c4337f4b Fix : shipment PDF was not using generation params ...

Conflicts:
	htdocs/core/modules/expedition/modules_expedition.php
	htdocs/expedition/fiche.php

2015-05-06 21:18:31 +02:00

..

doc

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

2015-02-10 21:33:43 +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

Fix : shipment PDF was not using generation params

2015-05-06 21:18:31 +02:00