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

..

commande.class.php

Merge remote-tracking branch 'origin/3.7' into develop

2015-01-18 18:44:22 +01:00

commandestats.class.php

Removed closing php tag

2014-05-03 18:18:44 +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