Laurent Destailleur c73fe965d2 Merge remote-tracking branch 'origin/3.6' into 3.7 ...

Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php

2015-08-13 03:58:32 +02:00

..

commande.class.php

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

2015-08-13 03:58:32 +02: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