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

Conflicts:
	htdocs/compta/facture/list.php
	htdocs/filefunc.inc.php

2016-12-26 12:42:23 +01:00

..

doc

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

2016-12-26 12:42:23 +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