Laurent Destailleur b267402df6 Merge remote-tracking branch 'origin/4.0' into develop ...

Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/main.lang
	htdocs/societe/rib.php

2016-08-01 15:15:32 +02:00

..

doc

Merge remote-tracking branch 'origin/4.0' into develop

2016-08-01 15:15:32 +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

mod_commande_marbre.php

More substitutions

2014-06-12 11:31:53 +02:00

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