Laurent Destailleur b57476153f Merge remote-tracking branch 'origin/3.9' into develop ...

Conflicts:
	htdocs/admin/menus/edit.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/societe/consumption.php

2016-06-04 01:14:36 +02:00

..

getSupplierPrices.php

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

2016-06-04 01:14:36 +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