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_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 phpcs	2015-05-07 13:28:03 +02:00