Laurent Destailleur 6f474c403c Merge remote-tracking branch 'origin/3.8' into develop ...

Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
	htdocs/societe/notify/card.php
	htdocs/societe/price.php

2015-12-27 19:15:20 +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

productMargins.php

The component selectAjaxArray can return javascript part into a global

2015-11-07 15:46:06 +01:00

thirdpartyMargins.php

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

2015-12-27 19:15:20 +01:00