Laurent Destailleur ff8969073c Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: htdocs/contrat/class/contrat.class.php htdocs/core/class/extrafields.class.php htdocs/main.inc.php		2015-07-28 18:57:13 +02:00
..
doc_generic_shipment_odt.modules.php	Uniformize code: property "nom" for thirdparty is aliased into "name"	2014-10-04 17:20:17 +02: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
pdf_merou.modules.php	Several fixes. Fix #2927	2015-07-13 11:22:18 +02:00
pdf_rouget.modules.php	Merge remote-tracking branch 'origin/3.7' into 3.8	2015-07-28 18:57:13 +02:00