Laurent Destailleur 100312aac2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ...

develop

Conflicts:
	htdocs/adherents/class/cotisation.class.php

2016-09-26 01:32:50 +02:00

..

api_deprecated_commande.class.php

Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop

2016-08-02 17:43:12 +02:00

api_orders.class.php

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

2016-09-26 01:32:50 +02:00

commande.class.php

Correct travis & typo "Execuete"

2016-09-24 07:18:38 +02:00

commandestats.class.php

Fix SQL error on order stats

2016-06-02 12:37:37 +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