Marcos García de La Fuente ce7ed70d74 Merge branch 'develop' into commercial-name ... Conflicts: htdocs/comm/prospect/list.php htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/core/modules/propale/doc/pdf_azur.modules.php		2015-05-10 12:23:07 +02:00
..
doc	Merge branch 'develop' into commercial-name	2015-03-15 18:20:17 +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