Laurent Destailleur d80baaea69 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ...

Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php

2018-12-04 14:29:47 +01:00

..

api_orders.class.php

Fix space/tab

2018-05-29 10:04:20 +02:00

commande.class.php

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0

2018-12-04 14:29:47 +01:00

commandestats.class.php

Fix length of month too large

2017-12-08 16:15:41 +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