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

Conflicts:
	htdocs/core/lib/admin.lib.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/install/filelist.xml
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
	htdocs/societe/price.php

2015-11-05 01:50:30 +01:00

..

getSupplierPrices.php

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

2015-11-05 01:50:30 +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