Laurent Destailleur c635baa848 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ...

Conflicts:
	htdocs/langs/en_US/errors.lang

2017-01-03 01:34:15 +01:00

..

doc

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

2017-01-03 01:34:15 +01:00

index.html

…

mod_commande_marbre.php

…

mod_commande_saphir.php

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

modules_commande.php

translations

2016-01-07 10:07:05 +01:00