Laurent Destailleur ddb95e5765 Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/comm/mailing/fiche.php htdocs/compta/paiement/liste.php htdocs/contact/class/contact.class.php htdocs/core/lib/tax.lib.php htdocs/core/modules/expedition/doc/pdf_merou.modules.php htdocs/core/modules/expedition/doc/pdf_rouget.modules.php htdocs/langs/en_US/agenda.lang htdocs/webservices/server_contact.php		2015-02-10 21:33:43 +01: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	Created a method generateDocument for several classes	2014-09-16 12:30:37 +02:00