Laurent Destailleur e220ce5a82 Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/comm/card.php htdocs/comm/propal.php htdocs/commande/card.php htdocs/compta/facture.php htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/core/class/html.formcompany.class.php htdocs/custom/.gitignore htdocs/expedition/card.php htdocs/fourn/card.php htdocs/product/fournisseurs.php		2015-01-18 18:44:22 +01:00
..
class	Merge remote-tracking branch 'origin/3.7' into develop	2015-01-18 18:44:22 +01:00
stats	Removed closing php tag	2014-05-03 18:18:44 +02:00
tpl	Merge remote-tracking branch 'origin/3.6' into develop	2014-09-15 22:58:39 +02:00
apercu.php	Update apercu.php	2014-11-27 21:03:01 +01:00
contact.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
document.php	Qual: remove PHP closing tag (again)	2014-05-26 13:51:25 +02:00
index.php	Uniformize code: property "nom" for thirdparty is aliased into "name"	2014-10-04 17:20:17 +02:00
info.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
list.php	Merge remote-tracking branch 'origin/3.7' into develop	2014-12-26 04:57:55 +01:00
note.php	Removed closing php tag	2014-05-03 18:18:44 +02:00